mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1360 from nextcloud/removeGCMagain

Browse source 
Add GCM to gplay/modified
This commit is contained in:
Tobias Kaminsky 2017-08-18 09:46:37 +02:00 committed by GitHub
commit efdcf47b11
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -203,6 +203,7 @@ dependencies {
// uncomment for gplay, modified // uncomment for gplay, modified
// implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}" // implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
// implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}" // implementation "com.google.android.gms:play-services-base:${googleLibraryVersion}"
// implementation "com.google.android.gms:play-services-gcm:${googleLibraryVersion}"
// implementation "com.google.firebase:firebase-core:${googleLibraryVersion}" // implementation "com.google.firebase:firebase-core:${googleLibraryVersion}"
implementation 'org.parceler:parceler-api:1.1.6' implementation 'org.parceler:parceler-api:1.1.6'
annotationProcessor 'org.parceler:parceler:1.1.6' annotationProcessor 'org.parceler:parceler:1.1.6'

2
scripts/lint/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 1 error and 579 warnings</span> <span class="mdl-layout-title">Lint Report: 1 error and 576 warnings</span>

1
src/main/res/values/strings.xml
View file

@ -76,7 +76,6 @@
<string name="uploader_wrn_no_account_setup_btn_text">Setup</string> <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
<string name="uploader_wrn_no_account_quit_btn_text">Quit</string> <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
<string name="uploader_error_title_no_file_to_upload">No file to upload</string> <string name="uploader_error_title_no_file_to_upload">No file to upload</string>
<string name="uploader_error_message_received_piece_of_text">%1$s cannot upload a piece of text as a file.</string>
<string name="uploader_error_message_no_file_to_upload">Received data did not include a valid file.</string> <string name="uploader_error_message_no_file_to_upload">Received data did not include a valid file.</string>
<string name="uploader_error_title_file_cannot_be_uploaded">This file can not be uploaded</string> <string name="uploader_error_title_file_cannot_be_uploaded">This file can not be uploaded</string>
<string name="uploader_error_message_read_permission_not_granted">%1$s is not allowed to read a received file</string> <string name="uploader_error_message_read_permission_not_granted">%1$s is not allowed to read a received file</string>