Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add legacyExternalStorage flag and change firebase #172

Merged
merged 1 commit into from
Nov 9, 2020
Merged

add legacyExternalStorage flag and change firebase #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions services_app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ applicationScripts.each {
}

apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

android {
// The following are set in the common.gradle file
Expand Down Expand Up @@ -120,7 +122,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.fragment:fragment:1.3.0-beta01'
implementation 'com.google.firebase:firebase-analytics:17.5.0'
implementation 'com.google.firebase:firebase-analytics:18.0.0'
implementation 'com.google.firebase:firebase-crashlytics:17.2.2'

implementation 'androidx.multidex:multidex:2.0.1'
Expand Down Expand Up @@ -154,7 +156,3 @@ task grantPermissionForODKApp {
dependsOn grantServicesReadExternalStoragePermission
dependsOn grantServicesWriteExternalStoragePermission
}

apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

20 changes: 8 additions & 12 deletions services_app/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
{
"project_info": {
"project_number": "322300403941",
"firebase_url": "https://api-project-322300403941.firebaseio.com",
"project_id": "api-project-322300403941",
"storage_bucket": "api-project-322300403941.appspot.com"
"project_info": {
"project_number": "876360963794",
"firebase_url": "https://odk-x-97b95.firebaseio.com",
"project_id": "odk-x-97b95",
"storage_bucket": "odk-x-97b95.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:322300403941:android:decf3a91261ea092",
"mobilesdk_app_id": "1:876360963794:android:2dfda8551d981194f5bf0b",
"android_client_info": {
"package_name": "org.opendatakit.services"
}
},
"api_key": [
"api_key": [
{
"current_key": "AIzaSyDzdzuFvfI_BgaMAbIOBpfrVG3AIwhGIP8"
},
{
"current_key": "AIzaSyBNMza9CWEOq6kLIYp6UtpQJu7dPdMUgkE"
"current_key": "AIzaSyBsjcNb77BHWv81ubNn2hwW_D20hjsC_qM"
}
],
"services": {
Expand All @@ -27,7 +24,6 @@
}
}
}

],
"configuration_version": "1"
}
4 changes: 4 additions & 0 deletions services_app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opendatakit.services">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
Expand Down Expand Up @@ -47,6 +50,7 @@

<application
android:name="org.opendatakit.services.application.Services"
android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true"
android:allowBackup="true"
android:largeHeap="true"
Expand Down