From e7a7d00f2527471d14e53c97581be4416f55637d Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 3 Jun 2020 11:23:04 +1000 Subject: [PATCH] Fix build --- .gitignore | 1 - BUILDING.md | 7 +++---- google-services.json | 47 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 google-services.json diff --git a/.gitignore b/.gitignore index 191fbe6f5..a918936f2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,3 @@ jni/libspeex/.deps/ pkcs11.password fabric.properties play -google-services.json diff --git a/BUILDING.md b/BUILDING.md index 30683216f..142069ff0 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -18,9 +18,9 @@ Ensure that the following packages are installed from the Android SDK manager: * SDK Platform (All API levels) * Android Support Repository * Google Repository - + In Android studio, this can be done from the Quickstart panel, choose "Configure" then "SDK Manager". In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel. You may also need to install API version 28 in the SDK platforms tab. - + You will then need to clone and run `./gradlew install` on each of the following repositories IN ORDER: * https://github.com/loki-project/loki-messenger-android-curve-25519 @@ -40,8 +40,7 @@ Setting up a development environment and building from Android Studio 3. Paste the URL for the session-android project when prompted (https://github.com/loki-project/session-android.git). 4. Android Studio should detect the presence of a project file and ask you whether to open it. Click "yes". 5. Default config options should be good enough. -6. Right now, the google-services.json file is kept out of the public repository as it contains credentials for Firebase (used for push notifications) authentication. We haven't yet made a way to build the app without this file or without Firebase. Email niels@loki.network to get this file for your build. -7. Project initialisation and building should proceed. +6. Project initialization and building should proceed. Building Session from the command line --------------- diff --git a/google-services.json b/google-services.json new file mode 100644 index 000000000..8ad85fda3 --- /dev/null +++ b/google-services.json @@ -0,0 +1,47 @@ +{ + "project_info": { + "project_number": "43512467490", + "firebase_url": "https://loki-5a81e.firebaseio.com", + "project_id": "loki-5a81e", + "storage_bucket": "loki-5a81e.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:43512467490:android:12239ad88b21eedf19ba7b", + "android_client_info": { + "package_name": "network.loki.messenger" + } + }, + "oauth_client": [ + { + "client_id": "43512467490-5hlnkf47svrlsb79h5f0hmct6afv1ep7.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBPvEo_fyUsb3nuqhh20EwJGt_UXaVITrE" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "43512467490-5hlnkf47svrlsb79h5f0hmct6afv1ep7.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "43512467490-f04dj1ssk2medqq3t33odidvmi9bi9ob.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "com.loki-project.loki-messenger" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file