From 5971c3b80a8c2628cd7ad6586dfa3db30955fa09 Mon Sep 17 00:00:00 2001
From: rkodev <43806892+rkodev@users.noreply.github.com>
Date: Mon, 14 Dec 2020 09:19:07 +0300
Subject: [PATCH 1/2] Separate chw-apps authetication

---
 .github/workflows/ci.yml                          | 4 ++--
 opensrp-chw/build.gradle                          | 2 +-
 opensrp-chw/src/ba/res/xml/authenticator.xml      | 7 +++++++
 opensrp-chw/src/chad/res/xml/authenticator.xml    | 7 +++++++
 opensrp-chw/src/guinea/res/xml/authenticator.xml  | 7 +++++++
 opensrp-chw/src/liberia/res/xml/authenticator.xml | 7 +++++++
 opensrp-chw/src/lmh/res/xml/authenticator.xml     | 7 +++++++
 opensrp-chw/src/togo/res/xml/authenticator.xml    | 7 +++++++
 8 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 opensrp-chw/src/ba/res/xml/authenticator.xml
 create mode 100644 opensrp-chw/src/chad/res/xml/authenticator.xml
 create mode 100644 opensrp-chw/src/guinea/res/xml/authenticator.xml
 create mode 100644 opensrp-chw/src/liberia/res/xml/authenticator.xml
 create mode 100644 opensrp-chw/src/lmh/res/xml/authenticator.xml
 create mode 100644 opensrp-chw/src/togo/res/xml/authenticator.xml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b596bfd245..ea30c95aba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
   pull_request:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
 
 jobs:
   unit_tests:
diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle
index 5dea2a8ec2..d8d450a368 100644
--- a/opensrp-chw/build.gradle
+++ b/opensrp-chw/build.gradle
@@ -268,7 +268,7 @@ android {
             dimension = 'baseDimension'
             applicationIdSuffix ".togo"
             versionCode 13
-            versionName "1.0.13"
+            versionName "1.1.1"
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '1000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-togo.smartregister.org/opensrp/"'
diff --git a/opensrp-chw/src/ba/res/xml/authenticator.xml b/opensrp-chw/src/ba/res/xml/authenticator.xml
new file mode 100644
index 0000000000..f2f78d95bd
--- /dev/null
+++ b/opensrp-chw/src/ba/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.smartregister.chw.ba"
+    android:icon="@drawable/opensrp_logo"
+    android:smallIcon="@drawable/opensrp_logo"
+    android:label="@string/app_name"
+    android:accountPreferences="@xml/preferences"/>
\ No newline at end of file
diff --git a/opensrp-chw/src/chad/res/xml/authenticator.xml b/opensrp-chw/src/chad/res/xml/authenticator.xml
new file mode 100644
index 0000000000..f5ef7d1c27
--- /dev/null
+++ b/opensrp-chw/src/chad/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.smartregister.chw.chad"
+    android:icon="@drawable/opensrp_logo"
+    android:smallIcon="@drawable/opensrp_logo"
+    android:label="@string/app_name"
+    android:accountPreferences="@xml/preferences"/>
\ No newline at end of file
diff --git a/opensrp-chw/src/guinea/res/xml/authenticator.xml b/opensrp-chw/src/guinea/res/xml/authenticator.xml
new file mode 100644
index 0000000000..9abfb36452
--- /dev/null
+++ b/opensrp-chw/src/guinea/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.smartregister.chw.guinea"
+    android:icon="@drawable/opensrp_logo"
+    android:smallIcon="@drawable/opensrp_logo"
+    android:label="@string/app_name"
+    android:accountPreferences="@xml/preferences"/>
\ No newline at end of file
diff --git a/opensrp-chw/src/liberia/res/xml/authenticator.xml b/opensrp-chw/src/liberia/res/xml/authenticator.xml
new file mode 100644
index 0000000000..a6b9c78ecb
--- /dev/null
+++ b/opensrp-chw/src/liberia/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.smartregister.chw"
+    android:icon="@drawable/opensrp_logo"
+    android:smallIcon="@drawable/opensrp_logo"
+    android:label="@string/app_name"
+    android:accountPreferences="@xml/preferences"/>
\ No newline at end of file
diff --git a/opensrp-chw/src/lmh/res/xml/authenticator.xml b/opensrp-chw/src/lmh/res/xml/authenticator.xml
new file mode 100644
index 0000000000..8607e404c9
--- /dev/null
+++ b/opensrp-chw/src/lmh/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.smartregister.chw.lmh"
+    android:icon="@drawable/opensrp_logo"
+    android:smallIcon="@drawable/opensrp_logo"
+    android:label="@string/app_name"
+    android:accountPreferences="@xml/preferences"/>
\ No newline at end of file
diff --git a/opensrp-chw/src/togo/res/xml/authenticator.xml b/opensrp-chw/src/togo/res/xml/authenticator.xml
new file mode 100644
index 0000000000..8ba6d8b72f
--- /dev/null
+++ b/opensrp-chw/src/togo/res/xml/authenticator.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.smartregister.chw.togo"
+    android:icon="@drawable/opensrp_logo"
+    android:smallIcon="@drawable/opensrp_logo"
+    android:label="@string/app_name"
+    android:accountPreferences="@xml/preferences"/>
\ No newline at end of file

From d09b877c24e30789e8cd7c11fcd1418530ab0751 Mon Sep 17 00:00:00 2001
From: rkodev <43806892+rkodev@users.noreply.github.com>
Date: Mon, 14 Dec 2020 09:27:43 +0300
Subject: [PATCH 2/2] Remove check on ci

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ea30c95aba..b596bfd245 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master , master-v1 ]
+    branches: [ master ]
   pull_request:
-    branches: [ master , master-v1 ]
+    branches: [ master ]
 
 jobs:
   unit_tests: