Skip to content

Commit 3507c72

Browse files
pmusarajpmusaraj
committed
KoBoCollect whitelisted changes Jan 2020
minor README fix Enable Firebase
1 parent b6a6200 commit 3507c72

File tree

70 files changed

+622
-516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+622
-516
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,7 @@ javarosa/
4444

4545
# Config for the official ODK Collect build
4646
collect_app/src/odkCollectRelease/
47+
48+
# Kobo-specific tools
49+
kobocollect*
50+
collect_app/kobo

‎README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# KoBoCollect notes
2+
3+
This project is a whitelisted version of ODK Collect. To build a new version, follow these steps:
4+
5+
* Check out the latest stable tag from opendatakit/collect
6+
* Cherry-pick the commits from the previous KoBoCollect update (latest is: v1.23.3-aug2019)
7+
* Handle merge conflicts, if any
8+
* copy over the release keystore and secrets
9+
* run string replacements via "node kobo-string-replace.js"
10+
* manually set versionCode and versionName in build.gradle (if necessary)
11+
* build and release!
12+
113
# ODK Collect
214
![Platform](https://img.shields.io/badge/platform-Android-blue.svg)
315
[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

‎collect_app/build.gradle‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@ android {
9393
}
9494
}
9595

96+
flavorDimensions "version"
97+
98+
productFlavors {
99+
kobo {
100+
applicationId "org.koboc.collect.android"
101+
buildConfigField 'String', 'AUTHORITY', '"org.koboc.collect.android"'
102+
resValue("bool", "FIREBASE_ENABLED", "true")
103+
}
104+
}
105+
96106
buildTypes {
97107
// Release build for all forks
98108
release {

‎collect_app/src/debug/google-services.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
}
3838
],
3939
"configuration_version": "1"
40-
}
40+
}

‎collect_app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ the specific language governing permissions and limitations under the License.
189189

190190
<provider
191191
android:name=".provider.FormsProvider"
192-
android:authorities="org.odk.collect.android.provider.odk.forms"
192+
android:authorities="${applicationId}.provider.odk.forms"
193193
android:exported="true" />
194194
<provider
195195
android:name=".provider.InstanceProvider"
196-
android:authorities="org.odk.collect.android.provider.odk.instances"
196+
android:authorities="${applicationId}.provider.odk.instances"
197197
android:exported="true" />
198198

199199
<activity-alias

‎collect_app/src/main/assets/open_source_licenses.html‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
</head>
3030
<body>
3131

32-
<h3>
33-
Apache License Version 2.0, January 2004
34-
</h3>
32+
<h3>ODK Collect</h3><h3>Apache License Version 2.0, January 2004</h3>
3533
<ul>
3634
<li>
3735
<b>Bikram-sambat</b>

‎collect_app/src/main/java/org/odk/collect/android/activities/AboutActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public class AboutActivity extends CollectAbstractActivity implements
4242

4343
private static final String LICENSES_HTML_PATH = "file:///android_asset/open_source_licenses.html";
4444
private static final String GOOGLE_PLAY_URL = "https://play.google.com/store/apps/details?id=";
45-
private static final String ODK_WEBSITE = "https://opendatakit.org";
46-
private static final String ODK_FORUM = "https://forum.opendatakit.org";
45+
private static final String ODK_WEBSITE = "https://kobotoolbox.org";
46+
private static final String ODK_FORUM = "http://community.kobotoolbox.org";
4747

4848
private CustomTabHelper websiteTabHelper;
4949
private CustomTabHelper forumTabHelper;

‎collect_app/src/main/java/org/odk/collect/android/provider/FormsProviderAPI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* {@link FormsColumns#JR_FORM_ID} unless multiple {@link FormsColumns#JR_VERSION}s are defined.
2828
*/
2929
public final class FormsProviderAPI {
30-
static final String AUTHORITY = "org.odk.collect.android.provider.odk.forms";
30+
static final String AUTHORITY = "org.koboc.collect.android.provider.odk.forms";
3131

3232
private FormsProviderAPI() {
3333
}

‎collect_app/src/main/java/org/odk/collect/android/provider/InstanceProviderAPI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.provider.BaseColumns;
2121

2222
public final class InstanceProviderAPI {
23-
public static final String AUTHORITY = "org.odk.collect.android.provider.odk.instances";
23+
public static final String AUTHORITY = "org.koboc.collect.android.provider.odk.instances";
2424

2525
// This class cannot be instantiated
2626
private InstanceProviderAPI() {

‎collect_app/src/main/notes-web.png‎

15.3 KB
Loading

0 commit comments

Comments
 (0)