diff --git a/README.md b/README.md index 3d38fd0c..f984c2d0 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,16 @@ This fork tweaks MicroG to be usable by applications that require Google authent - Ads - Analytics - Car + - Droidguard + - Feedback + - Firebase - Games - Location - - Maps & Location + - Maps + - Recovery - SafetyNet - Self-Check + - Search - TapAndPay - Wallet - Wear-Api diff --git a/build.gradle b/build.gradle index 42e28afb..a3beae8d 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,6 @@ buildscript { ext.recyclerviewVersion = '1.1.0' ext.supportLibraryVersion = "28.0.0" - ext.slf4jVersion = "1.7.25" ext.wireVersion = '3.2.2' ext.androidBuildGradleVersion = "4.0.1" @@ -40,7 +39,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:$androidBuildGradleVersion" + classpath "com.android.tools.build:gradle:${androidBuildGradleVersion}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion" } diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl deleted file mode 100644 index f893aef8..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable CorpusStatus; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdate.aidl deleted file mode 100644 index c7f5e432..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdate.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable PIMEUpdate; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdateResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdateResponse.aidl deleted file mode 100644 index 0ae6e4bc..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/PIMEUpdateResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable PIMEUpdateResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/RequestIndexingSpecification.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/RequestIndexingSpecification.aidl deleted file mode 100644 index a0a785c1..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/RequestIndexingSpecification.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable RequestIndexingSpecification; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl deleted file mode 100644 index 0b3c47ff..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable SuggestSpecification; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl deleted file mode 100644 index 57d2d63b..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable SuggestionResults; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl deleted file mode 100644 index b52e3d4f..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.appdatasearch; - -parcelable UsageInfo; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl deleted file mode 100644 index ebc204c7..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl +++ /dev/null @@ -1,14 +0,0 @@ -package com.google.android.gms.appdatasearch.internal; - -import com.google.android.gms.appdatasearch.CorpusStatus; -import com.google.android.gms.appdatasearch.PIMEUpdateResponse; -import com.google.android.gms.appdatasearch.RequestIndexingSpecification; -import com.google.android.gms.appdatasearch.SuggestionResults; -import com.google.android.gms.appdatasearch.SuggestSpecification; - -interface IAppDataSearch { - SuggestionResults getSuggestions(String var1, String packageName, in String[] accounts, int maxNum, in SuggestSpecification specs) = 1; - boolean requestIndexing(String packageName, String accountName, long l, in RequestIndexingSpecification specs) = 3; - CorpusStatus getStatus(String packageName, String accountName) = 4; - PIMEUpdateResponse requestPIMEUpdate(String s1, String s2, int i, in byte[] bs) = 34; -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl deleted file mode 100644 index 77e618ac..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package com.google.android.gms.appdatasearch.internal; - -import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearchCallbacks; -import com.google.android.gms.appdatasearch.UsageInfo; - -interface ILightweightAppDataSearch { - void view(ILightweightAppDataSearchCallbacks callbacks, String packageName, in UsageInfo[] usageInfos); -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl deleted file mode 100644 index 338a1427..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package com.google.android.gms.appdatasearch.internal; - -interface ILightweightAppDataSearchCallbacks { -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/administration/internal/ISearchAdministrationService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/administration/internal/ISearchAdministrationService.aidl deleted file mode 100644 index 404544c2..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/administration/internal/ISearchAdministrationService.aidl +++ /dev/null @@ -1,5 +0,0 @@ -package com.google.android.gms.search.administration.internal; - -interface ISearchAdministrationService { - -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/ClearCorpusRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/ClearCorpusRequest.aidl deleted file mode 100644 index 9f718934..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/ClearCorpusRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.corpora; - -parcelable ClearCorpusRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusInfoRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusInfoRequest.aidl deleted file mode 100644 index 11b0a4dc..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusInfoRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.corpora; - -parcelable GetCorpusInfoRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusRequest.aidl deleted file mode 100644 index b2e549d7..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.corpora; - -parcelable GetCorpusStatusRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusResponse.aidl deleted file mode 100644 index a837a7db..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/GetCorpusStatusResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.corpora; - -parcelable GetCorpusStatusResponse; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingRequest.aidl deleted file mode 100644 index ad68ef35..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.corpora; - -parcelable RequestIndexingRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingResponse.aidl deleted file mode 100644 index 7aaa548c..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/RequestIndexingResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.corpora; - -parcelable RequestIndexingResponse; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaCallbacks.aidl deleted file mode 100644 index 863b016f..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaCallbacks.aidl +++ /dev/null @@ -1,9 +0,0 @@ -package com.google.android.gms.search.corpora.internal; - -import com.google.android.gms.search.corpora.RequestIndexingResponse; -import com.google.android.gms.search.corpora.GetCorpusStatusResponse; - -interface ISearchCorporaCallbacks { - void onRequestIndexing(in RequestIndexingResponse response) = 1; - void onGetCorpusStatus(in GetCorpusStatusResponse response) = 3; -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaService.aidl deleted file mode 100644 index fe2073c0..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/corpora/internal/ISearchCorporaService.aidl +++ /dev/null @@ -1,14 +0,0 @@ -package com.google.android.gms.search.corpora.internal; - -import com.google.android.gms.search.corpora.ClearCorpusRequest; -import com.google.android.gms.search.corpora.GetCorpusStatusRequest; -import com.google.android.gms.search.corpora.GetCorpusInfoRequest; -import com.google.android.gms.search.corpora.RequestIndexingRequest; -import com.google.android.gms.search.corpora.internal.ISearchCorporaCallbacks; - -interface ISearchCorporaService { - void requestIndexing(in RequestIndexingRequest request, ISearchCorporaCallbacks callbacks) = 1; - void clearCorpus(in ClearCorpusRequest request, ISearchCorporaCallbacks callbacks) = 2; - void getCorpusStatus(in GetCorpusStatusRequest request, ISearchCorporaCallbacks callbacks) = 3; - void getCorpusInfo(in GetCorpusInfoRequest request, ISearchCorporaCallbacks callbacks) = 4; -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.aidl deleted file mode 100644 index 426cbe47..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable GetCurrentExperimentIdsRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.aidl deleted file mode 100644 index 8fdb4567..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable GetCurrentExperimentIdsResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.aidl deleted file mode 100644 index 986ab4db..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable GetGlobalSearchSourcesRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.aidl deleted file mode 100644 index 86d52a13..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable GetGlobalSearchSourcesResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.aidl deleted file mode 100644 index 8d7382ed..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable GetPendingExperimentIdsRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.aidl deleted file mode 100644 index ca99ad5f..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable GetPendingExperimentIdsResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsRequest.aidl deleted file mode 100644 index 2bd4d8b3..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable SetExperimentIdsRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsResponse.aidl deleted file mode 100644 index ff552760..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetExperimentIdsResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable SetExperimentIdsResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.aidl deleted file mode 100644 index 79cbb179..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable SetIncludeInGlobalSearchRequest; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.aidl deleted file mode 100644 index a5f2d6d0..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.global; - -parcelable SetIncludeInGlobalSearchResponse; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminCallbacks.aidl deleted file mode 100644 index b08d9530..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminCallbacks.aidl +++ /dev/null @@ -1,16 +0,0 @@ -package com.google.android.gms.search.global.internal; - -import com.google.android.gms.search.global.GetCurrentExperimentIdsResponse; -import com.google.android.gms.search.global.GetGlobalSearchSourcesResponse; -import com.google.android.gms.search.global.GetPendingExperimentIdsResponse; -import com.google.android.gms.search.global.SetExperimentIdsResponse; -import com.google.android.gms.search.global.SetIncludeInGlobalSearchResponse; - -interface IGlobalSearchAdminCallbacks { - void onGetGlobalSearchSourcesResponse(in GetGlobalSearchSourcesResponse request) = 1; - void onSetExperimentIdsResponse(in SetExperimentIdsResponse response) = 2; - void onGetCurrentExperimentIdsResponse(in GetCurrentExperimentIdsResponse response) = 3; - void onGetPendingExperimentIdsResponse(in GetPendingExperimentIdsResponse response) = 4; - - void onSetIncludeInGlobalSearchResponse(in SetIncludeInGlobalSearchResponse response) = 7; -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminService.aidl deleted file mode 100644 index 95bc32a7..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/global/internal/IGlobalSearchAdminService.aidl +++ /dev/null @@ -1,17 +0,0 @@ -package com.google.android.gms.search.global.internal; - -import com.google.android.gms.search.global.GetCurrentExperimentIdsRequest; -import com.google.android.gms.search.global.GetGlobalSearchSourcesRequest; -import com.google.android.gms.search.global.GetPendingExperimentIdsRequest; -import com.google.android.gms.search.global.SetExperimentIdsRequest; -import com.google.android.gms.search.global.SetIncludeInGlobalSearchRequest; -import com.google.android.gms.search.global.internal.IGlobalSearchAdminCallbacks; - -interface IGlobalSearchAdminService { - void getGlobalSearchSources(in GetGlobalSearchSourcesRequest request, IGlobalSearchAdminCallbacks callbacks) = 1; - void setExperimentIds(in SetExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) = 2; - void getCurrentExperimentIds(in GetCurrentExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) = 3; - void getPendingExperimentIds(in GetPendingExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) = 4; - - void setIncludeInGlobalSearch(in SetIncludeInGlobalSearchRequest request, IGlobalSearchAdminCallbacks callbacks) = 7; -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryRequest.aidl deleted file mode 100644 index 1986e95d..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryRequest.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.queries; - -parcelable QueryRequest; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryResponse.aidl deleted file mode 100644 index 97047253..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/QueryResponse.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.search.queries; - -parcelable QueryResponse; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesCallbacks.aidl deleted file mode 100644 index 8bcb891e..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesCallbacks.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package com.google.android.gms.search.queries.internal; - -import com.google.android.gms.search.queries.QueryResponse; - -interface ISearchQueriesCallbacks { - void onQuery(in QueryResponse response) = 1; -} diff --git a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesService.aidl deleted file mode 100644 index 091cdae5..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/search/queries/internal/ISearchQueriesService.aidl +++ /dev/null @@ -1,8 +0,0 @@ -package com.google.android.gms.search.queries.internal; - -import com.google.android.gms.search.queries.QueryRequest; -import com.google.android.gms.search.queries.internal.ISearchQueriesCallbacks; - -interface ISearchQueriesService { - void query(in QueryRequest request, ISearchQueriesCallbacks callbacks) = 1; -} diff --git a/play-services-api/src/main/aidl/com/google/firebase/auth/api/internal/IFirebaseAuthService.aidl b/play-services-api/src/main/aidl/com/google/firebase/auth/api/internal/IFirebaseAuthService.aidl deleted file mode 100644 index 6269896b..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/auth/api/internal/IFirebaseAuthService.aidl +++ /dev/null @@ -1,5 +0,0 @@ -package com.google.firebase.auth.api.internal; - -interface IFirebaseAuthService { - -} \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/CompoundHashParcelable.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/CompoundHashParcelable.aidl deleted file mode 100644 index 689e5918..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/CompoundHashParcelable.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.firebase.database.connection.idl; - -parcelable CompoundHashParcelable; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/ConnectionConfig.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/ConnectionConfig.aidl deleted file mode 100644 index d6c1fc31..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/ConnectionConfig.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.firebase.database.connection.idl; - -parcelable ConnectionConfig; \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IConnectionAuthTokenProvider.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IConnectionAuthTokenProvider.aidl deleted file mode 100644 index 447f9f4a..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IConnectionAuthTokenProvider.aidl +++ /dev/null @@ -1,7 +0,0 @@ -package com.google.firebase.database.connection.idl; - -import com.google.firebase.database.connection.idl.IGetTokenCallback; - -interface IConnectionAuthTokenProvider { - void zero(boolean var1, IGetTokenCallback var2) = 0; -} \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IGetTokenCallback.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IGetTokenCallback.aidl deleted file mode 100644 index c4d45cdd..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IGetTokenCallback.aidl +++ /dev/null @@ -1,6 +0,0 @@ -package com.google.firebase.database.connection.idl; - -interface IGetTokenCallback { - void zero(String s) = 0; - void onError(String s) = 1; -} \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IListenHashProvider.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IListenHashProvider.aidl deleted file mode 100644 index a5aaa187..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IListenHashProvider.aidl +++ /dev/null @@ -1,11 +0,0 @@ -package com.google.firebase.database.connection.idl; - -import com.google.firebase.database.connection.idl.CompoundHashParcelable; - -interface IListenHashProvider { - String zzPY() = 0; - - boolean zzPZ() = 1; - - CompoundHashParcelable zzQF() = 2; -} \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnection.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnection.aidl deleted file mode 100644 index 21e00b1c..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnection.aidl +++ /dev/null @@ -1,44 +0,0 @@ -package com.google.firebase.database.connection.idl; - -import com.google.android.gms.dynamic.IObjectWrapper; - -import com.google.firebase.database.connection.idl.ConnectionConfig; -import com.google.firebase.database.connection.idl.IConnectionAuthTokenProvider; -import com.google.firebase.database.connection.idl.IListenHashProvider; -import com.google.firebase.database.connection.idl.IPersistentConnectionDelegate; -import com.google.firebase.database.connection.idl.IRequestResultCallback; - - -interface IPersistentConnection { - void setup(in ConnectionConfig var1, IConnectionAuthTokenProvider var2, IObjectWrapper var3, IPersistentConnectionDelegate var4) = 0; - - void initialize() = 1; - - void shutdown() = 2; - - void refreshAuthToken() = 3; - - void listen(in List var1, IObjectWrapper var2, IListenHashProvider var3, long var4, IRequestResultCallback var6) = 4; - - void unlisten(in List var1, IObjectWrapper var2) = 5; - - void purgeOutstandingWrites() = 6; - - void put(in List var1, IObjectWrapper var2, IRequestResultCallback var3) = 7; - - void compareAndPut(in List var1, IObjectWrapper var2, String var3, IRequestResultCallback var4) = 8; - - void merge(in List var1, IObjectWrapper var2, IRequestResultCallback var3) = 9; - - void onDisconnectPut(in List var1, IObjectWrapper var2, IRequestResultCallback var3) = 10; - - void onDisconnectMerge(in List var1, IObjectWrapper var2, IRequestResultCallback var3) = 11; - - void onDisconnectCancel(in List var1, IRequestResultCallback var2) = 12; - - void interrupt(String var1) = 13; - - void resume(String var1) = 14; - - boolean isInterrupted(String var1) = 15; -} diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnectionDelegate.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnectionDelegate.aidl deleted file mode 100644 index 9ae649d0..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IPersistentConnectionDelegate.aidl +++ /dev/null @@ -1,19 +0,0 @@ -package com.google.firebase.database.connection.idl; - -import com.google.android.gms.dynamic.IObjectWrapper; - -import com.google.firebase.database.connection.idl.RangeParcelable; - -interface IPersistentConnectionDelegate { - void zero(in List var1, IObjectWrapper var2, boolean var3, long var4) = 0; - - void one(in List var1, in List var2, IObjectWrapper var3, long var4) = 1; - - void two() = 2; - - void onDisconnect() = 3; - - void four(boolean var1) = 4; - - void five(IObjectWrapper var1) = 5; -} \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IRequestResultCallback.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IRequestResultCallback.aidl deleted file mode 100644 index 5806bc35..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/IRequestResultCallback.aidl +++ /dev/null @@ -1,5 +0,0 @@ -package com.google.firebase.database.connection.idl; - -interface IRequestResultCallback { - void zero(String var1, String var2) = 0; -} \ No newline at end of file diff --git a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/RangeParcelable.aidl b/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/RangeParcelable.aidl deleted file mode 100644 index 08d6df18..00000000 --- a/play-services-api/src/main/aidl/com/google/firebase/database/connection/idl/RangeParcelable.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.firebase.database.connection.idl; - -parcelable RangeParcelable; \ No newline at end of file diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java deleted file mode 100644 index 5c71ea0c..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import android.os.Bundle; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class CorpusStatus extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode; - @SafeParceled(1) - public boolean found; - @SafeParceled(2) - public long lastIndexedSeqno; - @SafeParceled(3) - public long lastCommittedSeqno; - @SafeParceled(4) - public long committedNumDocuments; - @SafeParceled(5) - public Bundle counters; - @SafeParceled(6) - public String g; - - public CorpusStatus() { - versionCode = 2; - } - - public static final Creator CREATOR = new AutoCreator(CorpusStatus.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java deleted file mode 100644 index 2f8a596f..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdate.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class PIMEUpdate extends AutoSafeParcelable { - - public static final Creator CREATOR = new AutoCreator(PIMEUpdate.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java deleted file mode 100644 index d542f48f..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/PIMEUpdateResponse.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class PIMEUpdateResponse extends AutoSafeParcelable { - @SafeParceled(1000) - private int versionCode; - - @SafeParceled(1) - private String b; - - @SafeParceled(2) - public final byte[] bytes; - - @SafeParceled(3) - public final PIMEUpdate[] updates; - - public PIMEUpdateResponse() { - versionCode = 1; - this.bytes = null; - this.updates = new PIMEUpdate[0]; - } - - public static final Creator CREATOR = new AutoCreator(PIMEUpdateResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java deleted file mode 100644 index 1be52c8f..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/QuerySpecification.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import java.util.List; - -public class QuerySpecification extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 2; - @SafeParceled(1) - public final boolean b; - //@SafeParceled(value = 2, subType = "TODO") - public final List c; - //@SafeParceled(value = 3, subType = "TODO") - public final List d; - @SafeParceled(4) - public final boolean e; - @SafeParceled(5) - public final int f; - @SafeParceled(6) - public final int g; - @SafeParceled(7) - public final boolean h; - @SafeParceled(8) - public final int i; - - private QuerySpecification() { - b = false; - c = null; - d = null; - e = false; - f = 0; - g = 0; - h = false; - i = 0; - } - - @Override - public String toString() { - return "QuerySpecification{" + - "versionCode=" + versionCode + - ", b=" + b + - ", c=" + c + - ", d=" + d + - ", e=" + e + - ", f=" + f + - ", g=" + g + - ", h=" + h + - ", i=" + i + - '}'; - } - - public static final Creator CREATOR = new AutoCreator(QuerySpecification.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java deleted file mode 100644 index 720f773c..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/RequestIndexingSpecification.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class RequestIndexingSpecification extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode; - - public static final Creator CREATOR = new AutoCreator(RequestIndexingSpecification.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java deleted file mode 100644 index fec25f00..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SearchResults.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class SearchResults extends AutoSafeParcelable { - @SafeParceled(1000) - private int versionCode = 2; - - public static Creator CREATOR = new AutoCreator(SearchResults.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java deleted file mode 100644 index 0f80a053..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class SuggestSpecification extends AutoSafeParcelable { - @SafeParceled(1000) - private int versionCode; - - public SuggestSpecification() { - versionCode = 2; - } - - public static final Creator CREATOR = new AutoCreator(SuggestSpecification.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java deleted file mode 100644 index f616d51d..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class SuggestionResults extends AutoSafeParcelable { - @SafeParceled(1000) - private int versionCode; - @SafeParceled(1) - public final String errorMessage; - - @SafeParceled(2) - public final String[] s1; - @SafeParceled(3) - public final String[] s2; - - private SuggestionResults() { - versionCode = 2; - errorMessage = null; - s1 = s2 = null; - } - - public SuggestionResults(String errorMessage) { - versionCode = 2; - this.errorMessage = errorMessage; - this.s1 = null; - this.s2 = null; - } - - public SuggestionResults(String[] s1, String[] s2) { - versionCode = 2; - this.errorMessage = null; - this.s1 = s1; - this.s2 = s2; - } - - public static final Creator CREATOR = new AutoCreator(SuggestionResults.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java deleted file mode 100644 index a2f0f9e7..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.appdatasearch; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class UsageInfo extends AutoSafeParcelable { - - public static Creator CREATOR = new AutoCreator(UsageInfo.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/ClearCorpusRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/ClearCorpusRequest.java deleted file mode 100644 index 8e91b869..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/ClearCorpusRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.corpora; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class ClearCorpusRequest extends AutoSafeParcelable { - public static Creator CREATOR = new AutoCreator(ClearCorpusRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusInfoRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusInfoRequest.java deleted file mode 100644 index 2da15091..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusInfoRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.corpora; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class GetCorpusInfoRequest extends AutoSafeParcelable { - public static Creator CREATOR = new AutoCreator(GetCorpusInfoRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java deleted file mode 100644 index 051a5332..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusRequest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.corpora; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class GetCorpusStatusRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final String packageName; - - @SafeParceled(2) - public final String corpus; - - private GetCorpusStatusRequest() { - packageName = null; - corpus = null; - } - - @Override - public String toString() { - return "GetCorpusStatusRequest{" + - "versionCode=" + versionCode + - ", packageName='" + packageName + '\'' + - ", corpus='" + corpus + '\'' + - '}'; - } - - public static Creator CREATOR = new AutoCreator(GetCorpusStatusRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java deleted file mode 100644 index 2611d67e..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/GetCorpusStatusResponse.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.corpora; - -import com.google.android.gms.appdatasearch.CorpusStatus; -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class GetCorpusStatusResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode; - - @SafeParceled(1) - public final Status status; - - @SafeParceled(2) - public final CorpusStatus corpusStatus; - - private GetCorpusStatusResponse() { - status = null; - corpusStatus = null; - } - - public GetCorpusStatusResponse(Status status, CorpusStatus corpusStatus) { - this.status = status; - this.corpusStatus = corpusStatus; - } - - public static Creator CREATOR = new AutoCreator(GetCorpusStatusResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java deleted file mode 100644 index 4fa3396b..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.corpora; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class RequestIndexingRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final String packageName; - - @SafeParceled(2) - public final String corpus; - - @SafeParceled(3) - public final long sequenceNumber; - - private RequestIndexingRequest() { - packageName = null; - corpus = null; - sequenceNumber = 0; - } - - @Override - public String toString() { - return "RequestIndexingRequest{" + - "versionCode=" + versionCode + - ", packageName='" + packageName + '\'' + - ", corpus='" + corpus + '\'' + - ", sequenceNumber=" + sequenceNumber + - '}'; - } - - public static Creator CREATOR = new AutoCreator(RequestIndexingRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java deleted file mode 100644 index cf25d6a7..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/corpora/RequestIndexingResponse.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.corpora; - -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class RequestIndexingResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode; - - @SafeParceled(1) - public final Status status; - - @SafeParceled(2) - public final boolean scheduledIndexing; - - private RequestIndexingResponse() { - status = null; - scheduledIndexing = false; - } - - public RequestIndexingResponse(Status status, boolean scheduledIndexing) { - this.status = status; - this.scheduledIndexing = scheduledIndexing; - } - - public static Creator CREATOR = new AutoCreator(RequestIndexingResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.java deleted file mode 100644 index 6cc364e9..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class GetCurrentExperimentIdsRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - public static final Creator CREATOR = new AutoCreator(GetCurrentExperimentIdsRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.java deleted file mode 100644 index 6fa3ef70..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/GetCurrentExperimentIdsResponse.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import java.util.Arrays; - -public class GetCurrentExperimentIdsResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final Status status; - - @SafeParceled(2) - public final int[] experimentIds; - - private GetCurrentExperimentIdsResponse() { - status = null; - experimentIds = null; - } - - public GetCurrentExperimentIdsResponse(Status status, int[] experimentIds) { - this.status = status; - this.experimentIds = experimentIds; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("GetCurrentExperimentIdsResponse{"); - sb.append("status=").append(status); - sb.append(", experimentIds=").append(Arrays.toString(experimentIds)); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(GetCurrentExperimentIdsResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.java deleted file mode 100644 index 6c062611..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesRequest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class GetGlobalSearchSourcesRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public boolean bool; - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("GetGlobalSearchSourcesRequest{"); - sb.append("bool=").append(bool); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(GetGlobalSearchSourcesRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.java deleted file mode 100644 index 3aa8e3b2..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/GetGlobalSearchSourcesResponse.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import android.os.Parcelable; - -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import java.util.Arrays; - -public class GetGlobalSearchSourcesResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final Status status; - - @SafeParceled(2) - public final Parcelable[] sources; - - private GetGlobalSearchSourcesResponse() { - status = null; - sources = null; - } - - public GetGlobalSearchSourcesResponse(Status status, Parcelable[] sources) { - this.status = status; - this.sources = sources; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("GetGlobalSearchSourcesResponse{"); - sb.append("status=").append(status); - sb.append(", sources=").append(Arrays.toString(sources)); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(GetGlobalSearchSourcesResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.java deleted file mode 100644 index 3df0a0cc..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class GetPendingExperimentIdsRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - public static final Creator CREATOR = new AutoCreator(GetPendingExperimentIdsRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.java deleted file mode 100644 index cd98184a..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/GetPendingExperimentIdsResponse.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import java.util.Arrays; - -public class GetPendingExperimentIdsResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final Status status; - - @SafeParceled(2) - public final int[] experimentIds; - - private GetPendingExperimentIdsResponse() { - status = null; - experimentIds = null; - } - - public GetPendingExperimentIdsResponse(Status status, int[] experimentIds) { - this.status = status; - this.experimentIds = experimentIds; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("GetPendingExperimentIdsResponse{"); - sb.append("status=").append(status); - sb.append(", experimentIds=").append(Arrays.toString(experimentIds)); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(GetPendingExperimentIdsResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsRequest.java deleted file mode 100644 index dd6982f2..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsRequest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import java.util.Arrays; - -public class SetExperimentIdsRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public byte[] experimentIds; - - @SafeParceled(2) - public boolean enable; - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("SetExperimentIdsRequest{"); - sb.append("experimentIds=").append(Arrays.toString(experimentIds)); - sb.append(", enable=").append(enable); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(SetExperimentIdsRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsResponse.java deleted file mode 100644 index 17fb679f..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/SetExperimentIdsResponse.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class SetExperimentIdsResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final Status status; - - private SetExperimentIdsResponse() { - status = null; - } - - public SetExperimentIdsResponse(Status status) { - this.status = status; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("SetExperimentIdsResponse{"); - sb.append("status=").append(status); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(SetExperimentIdsResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.java deleted file mode 100644 index 4e4fe7b6..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchRequest.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class SetIncludeInGlobalSearchRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public String packageName; - - @SafeParceled(2) - public String source; - - @SafeParceled(3) - public boolean enabled; - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("SetIncludeInGlobalSearchRequest{"); - sb.append("packageName='").append(packageName).append('\''); - sb.append(", source='").append(source).append('\''); - sb.append(", enabled=").append(enabled); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(SetIncludeInGlobalSearchRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.java deleted file mode 100644 index c9671038..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/global/SetIncludeInGlobalSearchResponse.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.global; - -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class SetIncludeInGlobalSearchResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final Status status; - - private SetIncludeInGlobalSearchResponse() { - status = null; - } - - public SetIncludeInGlobalSearchResponse(Status status) { - this.status = status; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("SetIncludeInGlobalSearchResponse{"); - sb.append("status=").append(status); - sb.append('}'); - return sb.toString(); - } - - public static final Creator CREATOR = new AutoCreator(SetIncludeInGlobalSearchResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryRequest.java b/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryRequest.java deleted file mode 100644 index b3f42a21..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryRequest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.queries; - -import com.google.android.gms.appdatasearch.QuerySpecification; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -import java.util.Arrays; - -public class QueryRequest extends AutoSafeParcelable { - - @SafeParceled(1000) - public int versionCode = 1; - @SafeParceled(1) - public String searchString; - @SafeParceled(2) - public String packageName; - @SafeParceled(3) - public String[] corpora; - @SafeParceled(4) - public int d; - @SafeParceled(5) - public int e; - @SafeParceled(6) - public QuerySpecification spec; - - @Override - public String toString() { - return "QueryRequest{" + - "versionCode=" + versionCode + - ", searchString='" + searchString + '\'' + - ", packageName='" + packageName + '\'' + - ", corpora=" + Arrays.toString(corpora) + - ", d=" + d + - ", e=" + e + - ", spec=" + spec + - '}'; - } - - public static Creator CREATOR = new AutoCreator(QueryRequest.class); -} diff --git a/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java b/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java deleted file mode 100644 index a3f1ce55..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/search/queries/QueryResponse.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.search.queries; - -import com.google.android.gms.appdatasearch.SearchResults; -import com.google.android.gms.common.api.Status; - -import org.microg.safeparcel.AutoSafeParcelable; -import org.microg.safeparcel.SafeParceled; - -public class QueryResponse extends AutoSafeParcelable { - - @SafeParceled(1000) - private int versionCode = 1; - - @SafeParceled(1) - public final Status status; - - @SafeParceled(2) - public final SearchResults results; - - private QueryResponse() { - status = null; - results = null; - } - - public QueryResponse(Status status, SearchResults results) { - this.status = status; - this.results = results; - } - - public static Creator CREATOR = new AutoCreator(QueryResponse.class); -} diff --git a/play-services-api/src/main/java/com/google/firebase/database/connection/idl/CompoundHashParcelable.java b/play-services-api/src/main/java/com/google/firebase/database/connection/idl/CompoundHashParcelable.java deleted file mode 100644 index 4b72c85d..00000000 --- a/play-services-api/src/main/java/com/google/firebase/database/connection/idl/CompoundHashParcelable.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.firebase.database.connection.idl; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class CompoundHashParcelable extends AutoSafeParcelable { - public static final Creator CREATOR = new AutoCreator(CompoundHashParcelable.class); -} diff --git a/play-services-api/src/main/java/com/google/firebase/database/connection/idl/ConnectionConfig.java b/play-services-api/src/main/java/com/google/firebase/database/connection/idl/ConnectionConfig.java deleted file mode 100644 index 290467b2..00000000 --- a/play-services-api/src/main/java/com/google/firebase/database/connection/idl/ConnectionConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.firebase.database.connection.idl; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class ConnectionConfig extends AutoSafeParcelable { - public static final Creator CREATOR = new AutoCreator(ConnectionConfig.class); -} diff --git a/play-services-api/src/main/java/com/google/firebase/database/connection/idl/RangeParcelable.java b/play-services-api/src/main/java/com/google/firebase/database/connection/idl/RangeParcelable.java deleted file mode 100644 index cfd0fd7c..00000000 --- a/play-services-api/src/main/java/com/google/firebase/database/connection/idl/RangeParcelable.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.firebase.database.connection.idl; - -import org.microg.safeparcel.AutoSafeParcelable; - -public class RangeParcelable extends AutoSafeParcelable { - public static final Creator CREATOR = new AutoCreator(RangeParcelable.class); -} diff --git a/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java b/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java index 3a06c85f..db5ff38c 100644 --- a/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java +++ b/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java @@ -41,36 +41,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { this.supportedServices = supportedServices; } - @Deprecated - @Override - public void getPlusService(IGmsCallbacks callback, int versionCode, String packageName, - String authPackage, String[] scopes, String accountName, Bundle params) - throws RemoteException { - Bundle extras = params == null ? new Bundle() : params; - extras.putString("auth_package", authPackage); - callGetService(GmsService.PLUS, callback, versionCode, packageName, extras, accountName, scopes); - } - - @Deprecated - @Override - public void getPanoramaService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.PANORAMA, callback, versionCode, packageName, params); - } - - @Deprecated - @Override - public void getAppDataSearchService(IGmsCallbacks callback, int versionCode, String packageName) - throws RemoteException { - callGetService(GmsService.INDEX, callback, versionCode, packageName); - } - - @Deprecated - @Override - public void getWalletService(IGmsCallbacks callback, int versionCode) throws RemoteException { - getWalletServiceWithPackageName(callback, versionCode, null); - } - @Deprecated @Override public void getPeopleService(IGmsCallbacks callback, int versionCode, String packageName, @@ -78,47 +48,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { callGetService(GmsService.PEOPLE, callback, versionCode, packageName, params); } - @Deprecated - @Override - public void getReportingService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.LOCATION_REPORTING, callback, versionCode, packageName, params); - } - - @Deprecated - @Override - public void getLocationService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.LOCATION, callback, versionCode, packageName, params); - } - - @Deprecated - @Override - public void getGoogleLocationManagerService(IGmsCallbacks callback, int versionCode, - String packageName, Bundle params) throws RemoteException { - callGetService(GmsService.LOCATION_MANAGER, callback, versionCode, packageName, params); - } - - @Deprecated - @Override - public void getGamesService(IGmsCallbacks callback, int versionCode, String packageName, - String accountName, String[] scopes, String gamePackageName, - IBinder popupWindowToken, String desiredLocale, Bundle params) - throws RemoteException { - Bundle extras = params == null ? new Bundle() : params; - extras.putString("com.google.android.gms.games.key.gamePackageName", gamePackageName); - extras.putString("com.google.android.gms.games.key.desiredLocale", desiredLocale); - //extras.putParcelable("com.google.android.gms.games.key.popupWindowToken", popupWindowToken); - callGetService(GmsService.GAMES, callback, versionCode, packageName, extras, accountName, scopes); - } - - @Deprecated - @Override - public void getAppStateService(IGmsCallbacks callback, int versionCode, String packageName, - String accountName, String[] scopes) throws RemoteException { - callGetService(GmsService.APPSTATE, callback, versionCode, packageName, null, accountName, scopes); - } - @Deprecated @Override public void getPlayLogService(IGmsCallbacks callback, int versionCode, String packageName, @@ -126,27 +55,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { callGetService(GmsService.PLAY_LOG, callback, versionCode, packageName, params); } - @Deprecated - @Override - public void getAdMobService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.ADREQUEST, callback, versionCode, packageName, params); - } - - @Deprecated - @Override - public void getDroidGuardService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.DROIDGUARD, callback, versionCode, packageName, params); - } - - @Deprecated - @Override - public void getLockboxService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.LOCKBOX, callback, versionCode, packageName, params); - } - @Deprecated @Override public void getCastMirroringService(IGmsCallbacks callback, int versionCode, String packageName, @@ -154,13 +62,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { callGetService(GmsService.CAST_MIRRORING, callback, versionCode, packageName, params); } - @Deprecated - @Override - public void getNetworkQualityService(IGmsCallbacks callback, int versionCode, - String packageName, Bundle params) throws RemoteException { - callGetService(GmsService.NETWORK_QUALITY, callback, versionCode, packageName, params); - } - @Deprecated @Override public void getGoogleIdentityService(IGmsCallbacks callback, int versionCode, @@ -168,13 +69,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { callGetService(GmsService.ACCOUNT, callback, versionCode, packageName, params); } - @Deprecated - @Override - public void getGoogleFeedbackService(IGmsCallbacks callback, int versionCode, - String packageName, Bundle params) throws RemoteException { - callGetService(GmsService.FEEDBACK, callback, versionCode, packageName, params); - } - @Deprecated @Override public void getCastService(IGmsCallbacks callback, int versionCode, String packageName, @@ -182,34 +76,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { callGetService(GmsService.CAST, callback, versionCode, packageName, params); } - @Deprecated - @Override - public void getDriveService(IGmsCallbacks callback, int versionCode, String packageName, - String[] scopes, String accountName, Bundle params) throws RemoteException { - callGetService(GmsService.DRIVE, callback, versionCode, packageName, params, accountName, scopes); - } - - @Deprecated - @Override - public void getLightweightAppDataSearchService(IGmsCallbacks callback, int versionCode, - String packageName) throws RemoteException { - callGetService(GmsService.LIGHTWEIGHT_INDEX, callback, versionCode, packageName); - } - - @Deprecated - @Override - public void getSearchAdministrationService(IGmsCallbacks callback, int versionCode, - String packageName) throws RemoteException { - callGetService(GmsService.SEARCH_ADMINISTRATION, callback, versionCode, packageName); - } - - @Deprecated - @Override - public void getAutoBackupService(IGmsCallbacks callback, int versionCode, String packageName, - Bundle params) throws RemoteException { - callGetService(GmsService.PHOTO_AUTO_BACKUP, callback, versionCode, packageName, params); - } - @Deprecated @Override public void getAddressService(IGmsCallbacks callback, int versionCode, String packageName) @@ -217,12 +83,6 @@ public abstract class AbstractGmsServiceBroker extends IGmsServiceBroker.Stub { callGetService(GmsService.ADDRESS, callback, versionCode, packageName); } - @Deprecated - @Override - public void getWalletServiceWithPackageName(IGmsCallbacks callback, int versionCode, String packageName) throws RemoteException { - callGetService(GmsService.WALLET, callback, versionCode, packageName); - } - private void callGetService(GmsService service, IGmsCallbacks callback, int gmsVersion, String packageName) throws RemoteException { callGetService(service, callback, gmsVersion, packageName, null); diff --git a/play-services-basement/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/play-services-basement/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl index 9649150d..80631e97 100644 --- a/play-services-basement/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl +++ b/play-services-basement/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl @@ -7,33 +7,12 @@ import com.google.android.gms.common.internal.GetServiceRequest; import com.google.android.gms.common.internal.ValidateAccountRequest; interface IGmsServiceBroker { - void getPlusService(IGmsCallbacks callback, int code, String packageName, String authPackage, in String[] scopes, String accountName, in Bundle params) = 0; - void getPanoramaService(IGmsCallbacks callback, int code, String packageName, in Bundle params) = 1; - void getAppDataSearchService(IGmsCallbacks callback, int code, String packageName) = 2; - void getWalletService(IGmsCallbacks callback, int code) = 3; void getPeopleService(IGmsCallbacks callback, int code, String str, in Bundle params) = 4; - void getReportingService(IGmsCallbacks callback, int code, String str, in Bundle params) = 5; - void getLocationService(IGmsCallbacks callback, int code, String str, in Bundle params) = 6; - void getGoogleLocationManagerService(IGmsCallbacks callback, int code, String str, in Bundle params) = 7; - void getGamesService(IGmsCallbacks callback, int code, String packageName, String accountName, in String[] scopes, String gamePackageName, IBinder popupWindowToken, String desiredLocale, in Bundle params) = 8; - void getAppStateService(IGmsCallbacks callback, int code, String packageName, String accountName, in String[] scopes) = 9; void getPlayLogService(IGmsCallbacks callback, int code, String str, in Bundle params) = 10; - void getAdMobService(IGmsCallbacks callback, int code, String str, in Bundle params) = 11; - void getDroidGuardService(IGmsCallbacks callback, int code, String str, in Bundle params) = 12; - void getLockboxService(IGmsCallbacks callback, int code, String str, in Bundle params) = 13; void getCastMirroringService(IGmsCallbacks callback, int code, String str, in Bundle params) = 14; - void getNetworkQualityService(IGmsCallbacks callback, int code, String str, in Bundle params) = 15; void getGoogleIdentityService(IGmsCallbacks callback, int code, String str, in Bundle params) = 16; - void getGoogleFeedbackService(IGmsCallbacks callback, int code, String str, in Bundle params) = 17; void getCastService(IGmsCallbacks callback, int code, String str, IBinder binder, in Bundle params) = 18; - void getDriveService(IGmsCallbacks callback, int code, String str1, in String[] args, String str2, in Bundle params) = 19; - void getLightweightAppDataSearchService(IGmsCallbacks callback, int code, String str) = 20; - void getSearchAdministrationService(IGmsCallbacks callback, int code, String str) = 21; - void getAutoBackupService(IGmsCallbacks callback, int code, String str, in Bundle params) = 22; void getAddressService(IGmsCallbacks callback, int code, String str) = 23; - - void getWalletServiceWithPackageName(IGmsCallbacks callback, int code, String packageName) = 41; - void getService(IGmsCallbacks callback, in GetServiceRequest request) = 45; void validateAccount(IGmsCallbacks callback, in ValidateAccountRequest request) = 46; } diff --git a/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java b/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java index 7d65a911..6fe5b71d 100644 --- a/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java +++ b/play-services-basement/src/main/java/org/microg/gms/common/GmsService.java @@ -19,88 +19,21 @@ package org.microg.gms.common; public enum GmsService { UNKNOWN(-2), ANY(-1), - GAMES(1, "com.google.android.gms.games.service.START"), - PLUS(2, "com.google.android.gms.plus.service.START", "com.google.android.gms.plus.service.internal.START"), - PANORAMA(3, "com.google.android.gms.panorama.service.START"), - WALLET(4, "com.google.android.gms.wallet.service.BIND"), PEOPLE(5, "com.google.android.gms.people.service.START"), - LOCATION(6), - APPSTATE(7, "com.google.android.gms.appstate.service.START"), - ADREQUEST(8, "com.google.android.gms.ads.service.START"), ACCOUNT(9, "com.google.android.gms.accounts.ACCOUNT_SERVICE"), CAST(10, "com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE"), - DRIVE(11, "com.google.android.gms.drive.ApiService.START"), ADDRESS(12, "com.google.android.gms.identity.service.BIND"), - CAR(13, "com.google.android.gms.car.service.START"), - WEARABLE(14, "com.google.android.gms.wearable.BIND"), AUTH(16, "com.google.android.gms.auth.service.START"), - FITNESS(17, "com.google.android.gms.fitness.GoogleFitnessService.START"), - REMINDERS(18, "com.google.android.gms.reminders.service.START"), - LIGHTWEIGHT_INDEX(19, "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE"), - DEVICE_CONNECTION(20, "com.google.android.gms.deviceconnection.service.START"), - INDEX(21, "com.google.android.gms.icing.INDEX_SERVICE"), - LOCATION_REPORTING(22, "com.google.android.gms.location.reporting.service.START", "com.google.android.location.reporting.service.START"), - LOCATION_MANAGER(23, "com.google.android.location.internal.GoogleLocationManagerService.START"), PLAY_LOG(24, "com.google.android.gms.playlog.service.START"), - DROIDGUARD(25, "com.google.android.gms.droidguard.service.START"), - LOCKBOX(26, "com.google.android.gms.lockbox.service.START"), CAST_MIRRORING(27, "com.google.android.gms.cast_mirroring.service.START"), - NETWORK_QUALITY(28, "com.google.android.gms.mdm.services.START"), - FEEDBACK(29, "com.google.android.gms.feedback.internal.IFeedbackService"), - SEARCH_ADMINISTRATION(30), - PHOTO_AUTO_BACKUP(31, "com.google.android.gms.photos.autobackup.service.START"), - SEARCH_QUERIES(32), - SEARCH_GLOBAL(33), - UDC(35, "com.google.android.gms.udc.service.START"), - SEARCH_CORPORA(36), - DEVICE_MANAGER(37, "com.google.android.gms.mdm.services.DeviceManagerApiService.START"), - PSEUDONYMOUS_ID(38, "com.google.android.gms.pseudonymous.service.START"), COMMON(39, "com.google.android.gms.common.service.START"), CLEARCUT_LOGGER(40, "com.google.android.gms.clearcut.service.START"), - USAGE_REPORTING(41, "com.google.android.gms.usagereporting.service.START"), - KIDS(42, "com.google.android.gms.kids.service.START"), - DOWNLOAD(43, "com.google.android.gms.common.download.START"), SIGN_IN(44, "com.google.android.gms.signin.service.START"), - SAFETY_NET_CLIENT(45, "com.google.android.gms.safetynet.service.START"), - GSERVICES(46, "com.google.android.gms.ads.gservice.START"), CONTEXT_MANAGER(47, "com.google.android.contextmanager.service.ContextManagerService.START"), - AUDIO_MODEM(48, "com.google.android.gms.audiomodem.service.AudioModemService.START"), - NEARBY_SHARING(49, "com.google.android.gms.nearby.sharing.service.NearbySharingService.START"), - LIGHTWEIGHT_NETWORK_QUALITY(50, "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START"), PHENOTYPE(51, "com.mgoogle.android.gms.phenotype.service.START"), - VOICE_UNLOCK(52, "com.google.android.gms.speech.service.START"), - NEARBY_CONNECTIONS(54, "com.google.android.gms.nearby.connection.service.START"), - FITNESS_SENSORS(55, "com.google.android.gms.fitness.SensorsApi"), - FITNESS_RECORDING(56, "com.google.android.gms.fitness.RecordingApi"), - FITNESS_HISTORY(57, "com.google.android.gms.fitness.HistoryApi"), - FITNESS_SESSIONS(58, "com.google.android.gms.fitness.SessionsApi"), - FITNESS_BLE(59, "com.google.android.gms.fitness.BleApi"), - FITNESS_CONFIG(60, "com.google.android.gms.fitness.ConfigApi"), - FITNESS_INTERNAL(61, "com.google.android.gms.fitness.InternalApi"), - NEARBY_MESSAGES(62, "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START"), - HELP(63, "com.google.android.gms.googlehelp.service.GoogleHelpService.START"), - CONFIG(64, "com.google.android.gms.config.START"), - GEODATA(65, "com.google.android.gms.location.places.GeoDataApi"), - SEARCH_IME(66), - PLACE_DETECTION(67, "com.google.android.gms.location.places.PlaceDetectionApi"), CREDENTIALS(68, "com.google.android.gms.auth.api.credentials.service.START"), - NEARBY_BOOTSTRAP(69, "com.google.android.gms.nearby.bootstrap.service.NearbyBootstrapService.START"), - PLUS_INTERNAL(70), - SOURCE_DEVICE(75, "com.google.android.gms.smartdevice.d2d.SourceDeviceService.START"), - TARGET_DEVICE(76, "com.google.android.gms.smartdevice.d2d.TargetDeviceService.START"), - APP_INVITE(77, "com.google.android.gms.appinvite.service.START"), - TAP_AND_PAY(79, "com.google.android.gms.tapandpay.service.BIND"), - ACCOUNTS(81, "com.google.android.gms.smartdevice.setup.accounts.AccountsService.START"), - TRUST_AGENT(85, "com.google.android.gms.trustagent.StateApi.START"), MEASUREMENT(93, "com.google.android.gms.measurement.START"), - FREIGHTER(98, "com.google.android.gms.freighter.service.START"), - BLE(111, "com.google.android.gms.beacon.internal.IBleService.START"), - APP_INDEXING(113), GASS(116, "com.google.android.gms.gass.START"), - WORK_ACCOUNT(120), - AD_CACHE(123, "com.google.android.gms.ads.service.CACHE"), - DYNAMIC_LINKS(131, "com.google.firebase.dynamiclinks.service.START"), - NEARBY_EXPOSURE(236, "com.google.android.gms.nearby.exposurenotification.START"), ; public int SERVICE_ID; @@ -113,11 +46,6 @@ public enum GmsService { this.SECONDARY_ACTIONS = actions; } - public interface ADVERTISING_ID { - // Has no service id - String ACTION = "com.google.android.gms.ads.identifier.service.START"; - } - public static GmsService byServiceId(int serviceId) { for (GmsService service : values()) { if (service.SERVICE_ID == serviceId) return service; diff --git a/play-services-core-proto/src/main/proto/snet.proto b/play-services-core-proto/src/main/proto/snet.proto deleted file mode 100644 index 5cef4672..00000000 --- a/play-services-core-proto/src/main/proto/snet.proto +++ /dev/null @@ -1,34 +0,0 @@ -option java_package = "org.microg.gms.snet"; - -option java_outer_classname = "SafetyNetProto"; - -message SELinuxState { - optional bool supported = 1; - optional bool enabled = 2; -} - -message FileState { - optional string fileName = 1; - optional bytes digest = 2; -} - -message SafetyNetData { - optional bytes nonce = 1; - optional string packageName = 2; - repeated bytes signatureDigest = 3; - optional bytes fileDigest = 4; - optional int32 gmsVersionCode = 5; - repeated FileState suCandidates = 6; - optional SELinuxState seLinuxState = 7; - optional int64 currentTimeMs = 8; - optional bool googleCn = 9; -} - -message AttestRequest { - optional bytes safetyNetData = 1; - optional string droidGuardResult = 2; -} - -message AttestResponse { - optional string result = 2; -} \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index bae518ba..c8cc35b4 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -20,8 +20,8 @@ apply plugin: 'kotlin-android-extensions' dependencies { implementation "com.squareup.wire:wire-runtime:$wireVersion" - implementation "de.hdodenhof:circleimageview:1.3.0" - implementation "org.conscrypt:conscrypt-android:2.1.0" + implementation 'de.hdodenhof:circleimageview:3.1.0' + implementation 'org.conscrypt:conscrypt-android:2.4.0' // TODO: Switch to upstream once raw requests are merged // https://github.com/vitalidze/chromecast-java-api-v2/pull/99 // implementation "su.litvak.chromecast:api-v2:0.10.4" @@ -29,8 +29,6 @@ dependencies { // Specified manually due to // https://github.com/vitalidze/chromecast-java-api-v2/issues/91 - api "org.slf4j:slf4j-api:1.7.25" - api "uk.uuid.slf4j:slf4j-android:1.7.25-1" implementation project(':play-services-base-core') implementation project(':play-services-core-proto') @@ -39,8 +37,7 @@ dependencies { implementation project(':play-services-cast-api') // AndroidX UI - implementation "androidx.multidex:multidex:$multidexVersion" - implementation "androidx.appcompat:appcompat:$appcompatVersion" + implementation "androidx.appcompat:appcompat:1.2.0" implementation "androidx.mediarouter:mediarouter:$mediarouterVersion" implementation "androidx.preference:preference:$preferenceVersion" @@ -51,6 +48,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" + implementation project(path: ':play-services-basement') } android { diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle index d1479ecf..24c2d2be 100644 --- a/play-services-core/microg-ui-tools/build.gradle +++ b/play-services-core/microg-ui-tools/build.gradle @@ -38,7 +38,7 @@ android { } dependencies { - implementation "androidx.appcompat:appcompat:$appcompatVersion" + implementation "androidx.appcompat:appcompat:1.2.0" implementation "androidx.preference:preference:$preferenceVersion" } diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml b/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml deleted file mode 100644 index 20909c3a..00000000 --- a/play-services-core/microg-ui-tools/src/main/res/drawable-v21/switchbar_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml deleted file mode 100644 index 9c5aba9c..00000000 --- a/play-services-core/microg-ui-tools/src/main/res/drawable/switchbar_background.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml b/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml deleted file mode 100644 index 02d68ae3..00000000 --- a/play-services-core/microg-ui-tools/src/main/res/layout/app_bar.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml b/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml index d18d9e1d..d42bf4a6 100644 --- a/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml +++ b/play-services-core/microg-ui-tools/src/main/res/layout/condition_card.xml @@ -17,7 +17,8 @@ --> + app:tint="?android:attr/textColorPrimaryInverse" /> + app:tint="?android:attr/textColorPrimaryInverse" /> @@ -95,13 +96,11 @@ android:textColor="?android:attr/textColorPrimaryInverse"/> %1$s %2$s Alle Rechte vorbehalten. - Selbstprüfung - - Berechtigungen erteilt - %1$s: - Hier drücken um die Berechtigung \"%1$s\" zu erteilen. Verweigern einer Berechtigung kann zu Fehlverhalten in anderen Anwendungen führen. - microG UI Demo Zusammenfassung Version v0.1.0 diff --git a/play-services-core/microg-ui-tools/src/main/res/values-fr/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-fr/strings.xml index 01e065ec..6172ffb1 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-fr/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-fr/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s Tous droits réservés. - Auto-vérification. - - Autorisations accordées - Autorisation à %1$s : - Touchez ici pour accorder l’autorisation %1$s. Des applications peuvent mal se comporter si vous ne le faites pas. - Version v0.1.0 Librairies incluses diff --git a/play-services-core/microg-ui-tools/src/main/res/values-it/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-it/strings.xml index 2fcf9892..18a27836 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-it/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-it/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s Tutti i diritti sono riservati. - Auto-controllo - - Autorizzazione concessa - Autorizzazione a %1$s: - Tocca qui per concedere l\'autorizzazione a %1$s. Negare l\'autorizzazione può comportare il funzionamento anomalo di altre applicazioni. - microG UI Demo Sommario Versione v0.1.0 diff --git a/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml index 0ef7511c..2056c373 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s Wszelkie prawa zastrzeżone. - Samo-sprawdzenie - - Udzielono uprawnień - Uprawnienie do %1$s: - Stuknij, aby udzielić uprawnienia na %1$s. Nieudzielenie uprawnienia może powodować problemy z aplikacjami. - Demo microG UI Podsumowanie Wersja v0.1.0 diff --git a/play-services-core/microg-ui-tools/src/main/res/values-ru/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-ru/strings.xml index c069d80c..707b5555 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-ru/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-ru/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s Все права защищены. - Проверка работоспособности - - Права доступа предоставлены - Разрешение для %1$s: - Нажмите здесь, чтобы дать разрешение на %1$s. Непредоставление разрешения может привести некорректной работе приложения. - microG UI Demo Сводка Версия v0.1.0 diff --git a/play-services-core/microg-ui-tools/src/main/res/values-sr/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-sr/strings.xml index 2c4d3cfe..908d14e3 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-sr/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-sr/strings.xml @@ -17,10 +17,4 @@ - микроГ самопровера - - Дозволе одобрене - Дозволе за %1$s: - Тапните овде да одобрите дозволе за %1$s. Не одобравање дозвола може да резултира чудним понашањем апликација. - - + diff --git a/play-services-core/microg-ui-tools/src/main/res/values-uk/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-uk/strings.xml index 9ebd2b1b..199080f1 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-uk/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-uk/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s Всі права захищено. - Само-тестування - - Доступ надано - Доступ до %1$s: - Торкніться, аби надати доступ до %1$s. Без доступу не гарантується робота додатку належним чином. - Демонстрація microG UI Резюме Версія v0.1.0 diff --git a/play-services-core/microg-ui-tools/src/main/res/values-zh-rTW/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-zh-rTW/strings.xml index b4a031e8..09b7db7c 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values-zh-rTW/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values-zh-rTW/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s 保留所有權利。 - 自我檢查 - - 允許權限 - 給 %1$s的權限： - 按這裡給%1$s權限。不允許權限可能導致程式運作不正常。 - microG UI Demo 大綱 版本 v0.1.0 diff --git a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml index d1d2087c..1025bd30 100644 --- a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml +++ b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml @@ -21,12 +21,6 @@ %1$s %2$s All rights reserved. - Self-Check - - Permissions granted - Permission to %1$s: - Touch here to grant permission to %1$s. Not granting the permission can result in misbehaving applications. - microG UI Demo Summary Version v0.1.0 diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index 15a6238d..08e23664 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -188,16 +188,6 @@ - - - - - - - - - - @@ -216,12 +206,6 @@ android:value="1" /> - - - - - - - - - - - - - - - - - - - - - - - @@ -401,32 +368,12 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java b/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java deleted file mode 100644 index 0ffac47d..00000000 --- a/play-services-core/src/main/java/com/google/android/gms/auth/FirebaseAuthService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.auth; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; - -import org.microg.gms.auth.firebase.FirebaseAuthServiceImpl; - -public class FirebaseAuthService extends Service { - public IBinder onBind(Intent intent) { - return new FirebaseAuthServiceImpl(this); - } -} diff --git a/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java b/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java deleted file mode 100644 index 8f1043a4..00000000 --- a/play-services-core/src/main/java/com/google/android/gms/dynamite/descriptors/com/google/android/gms/firebase_database/ModuleDescriptor.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.dynamite.descriptors.com.google.android.gms.firebase_database; - -public class ModuleDescriptor { - public static final String MODULE_ID = "com.google.android.gms.firebase_database"; - public static final int MODULE_VERSION = 3; -} diff --git a/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java b/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java deleted file mode 100644 index c330e43e..00000000 --- a/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.recovery; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; -import android.util.Log; - -public class RecoveryService extends Service { - private static final String TAG = "GmsRecoverySvc"; - - @Override - public IBinder onBind(Intent intent) { - Log.d(TAG, "onBind: " + intent); - return null; - } -} diff --git a/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java b/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java deleted file mode 100644 index a8efde6e..00000000 --- a/play-services-core/src/main/java/com/google/firebase/database/connection/idl/IPersistentConnectionImpl.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.firebase.database.connection.idl; - -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.dynamic.IObjectWrapper; - -import java.util.List; - -public class IPersistentConnectionImpl extends IPersistentConnection.Stub { - private static final String TAG = "GmsFirebaseDbConImpl"; - - @Override - public void setup(ConnectionConfig var1, IConnectionAuthTokenProvider var2, IObjectWrapper var3, IPersistentConnectionDelegate var4) throws RemoteException { - Log.d(TAG, "unimplemented Method: setup"); - - } - - @Override - public void initialize() throws RemoteException { - Log.d(TAG, "unimplemented Method: initialize"); - - } - - @Override - public void shutdown() throws RemoteException { - Log.d(TAG, "unimplemented Method: shutdown"); - - } - - @Override - public void refreshAuthToken() throws RemoteException { - Log.d(TAG, "unimplemented Method: refreshAuthToken"); - - } - - @Override - public void listen(List var1, IObjectWrapper var2, IListenHashProvider var3, long var4, IRequestResultCallback var6) throws RemoteException { - Log.d(TAG, "unimplemented Method: listen"); - - } - - @Override - public void unlisten(List var1, IObjectWrapper var2) throws RemoteException { - Log.d(TAG, "unimplemented Method: unlisten"); - - } - - @Override - public void purgeOutstandingWrites() throws RemoteException { - Log.d(TAG, "unimplemented Method: purgeOutstandingWrites"); - - } - - @Override - public void put(List var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException { - Log.d(TAG, "unimplemented Method: put"); - - } - - @Override - public void compareAndPut(List var1, IObjectWrapper var2, String var3, IRequestResultCallback var4) throws RemoteException { - Log.d(TAG, "unimplemented Method: compareAndPut"); - - } - - @Override - public void merge(List var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException { - Log.d(TAG, "unimplemented Method: merge"); - - } - - @Override - public void onDisconnectPut(List var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException { - Log.d(TAG, "unimplemented Method: onDisconnectPut"); - - } - - @Override - public void onDisconnectMerge(List var1, IObjectWrapper var2, IRequestResultCallback var3) throws RemoteException { - Log.d(TAG, "unimplemented Method: onDisconnectMerge"); - - } - - @Override - public void onDisconnectCancel(List var1, IRequestResultCallback var2) throws RemoteException { - Log.d(TAG, "unimplemented Method: onDisconnectCancel"); - - } - - @Override - public void interrupt(String var1) throws RemoteException { - Log.d(TAG, "unimplemented Method: interrupt"); - - } - - @Override - public void resume(String var1) throws RemoteException { - Log.d(TAG, "unimplemented Method: resume"); - - } - - @Override - public boolean isInterrupted(String var1) throws RemoteException { - Log.d(TAG, "unimplemented Method: isInterrupted"); - return false; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java deleted file mode 100644 index e7693e39..00000000 --- a/play-services-core/src/main/java/org/microg/gms/auth/firebase/FirebaseAuthServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.auth.firebase; - -import android.content.Context; -import android.os.Parcel; -import android.os.RemoteException; -import android.util.Log; - -import com.google.firebase.auth.api.internal.IFirebaseAuthService; - -public class FirebaseAuthServiceImpl extends IFirebaseAuthService.Stub { - private static final String TAG = "GmsFirebaseAuthImpl"; - - private Context context; - - public FirebaseAuthServiceImpl(Context context) { - this.context = context; - } - - @Override - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (super.onTransact(code, data, reply, flags)) return true; - Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); - return false; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java index 0b4777d7..ae5e96d5 100644 --- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java +++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java @@ -441,11 +441,6 @@ public class LoginActivity extends AssistantActivity { return SDK_INT; } - @JavascriptInterface - public final void getDroidGuardResult(String s) { - Log.d(TAG, "JSBridge: getDroidGuardResult: " + s); - } - @JavascriptInterface public final int getDeviceDataVersionInfo() { return 1; diff --git a/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java b/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java deleted file mode 100644 index 7760862d..00000000 --- a/play-services-core/src/main/java/org/microg/gms/droidguard/DroidGuardService.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.droidguard; - -import android.util.Log; - -import com.google.android.gms.common.internal.GetServiceRequest; -import com.google.android.gms.common.internal.IGmsCallbacks; - -import org.microg.gms.BaseService; -import org.microg.gms.common.GmsService; - -public class DroidGuardService extends BaseService { - - public DroidGuardService() { - super("GmsDroidGuardSvc", GmsService.DROIDGUARD); - } - - @Override - public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) { - // TODO - Log.d(TAG, "handleServiceRequest"); - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java index b303aa0a..b552ff86 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/GcmPrefs.java @@ -43,8 +43,8 @@ public class GcmPrefs implements SharedPreferences.OnSharedPreferenceChangeListe public static final String PREF_LEARNT_WIFI = "gcm_learnt_wifi"; public static final String PREF_LEARNT_OTHER = "gcm_learnt_other"; - private static final int MIN_INTERVAL = 5 * 60 * 1000; // 5 minutes - private static final int MAX_INTERVAL = 30 * 60 * 1000; // 30 minutes + private static final int MIN_INTERVAL = 1 * 60 * 1000; // 1 minute + private static final int MAX_INTERVAL = 3 * 60 * 1000; // 3 minutes private static GcmPrefs INSTANCE; diff --git a/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java deleted file mode 100644 index 9340def3..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.Parcel; -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.appdatasearch.CorpusStatus; -import com.google.android.gms.appdatasearch.PIMEUpdateResponse; -import com.google.android.gms.appdatasearch.RequestIndexingSpecification; -import com.google.android.gms.appdatasearch.SuggestSpecification; -import com.google.android.gms.appdatasearch.SuggestionResults; -import com.google.android.gms.appdatasearch.internal.IAppDataSearch; - -public class AppDataSearchImpl extends IAppDataSearch.Stub { - private static final String TAG = "GmsIcingAppDataImpl"; - - @Override - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (super.onTransact(code, data, reply, flags)) return true; - Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); - return false; - } - - @Override - public SuggestionResults getSuggestions(String var1, String packageName, String[] accounts, int maxNum, SuggestSpecification specs) throws RemoteException { - return new SuggestionResults("Unknown error"); - } - - @Override - public boolean requestIndexing(String packageName, String accountName, long l, RequestIndexingSpecification specs) throws RemoteException { - Log.d(TAG, "requestIndexing: " + accountName + " @ " + packageName + ", " + l); - return true; - } - - @Override - public CorpusStatus getStatus(String packageName, String accountName) throws RemoteException { - Log.d(TAG, "getStatus: " + accountName + " @ " + packageName); - CorpusStatus status = new CorpusStatus(); - status.found = true; - return status; - } - - @Override - public PIMEUpdateResponse requestPIMEUpdate(String s1, String s2, int i, byte[] bs) throws RemoteException { - Log.d(TAG, "requestPIMEUpdate: " + s1 + ", " + s2 + ", " + i + ", " + (bs == null ? "null" : new String(bs))); - return new PIMEUpdateResponse(); - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java deleted file mode 100644 index e3aaf3e2..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/GlobalSearchAdminImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.Parcel; -import android.os.Parcelable; -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.common.api.Status; -import com.google.android.gms.search.global.GetCurrentExperimentIdsRequest; -import com.google.android.gms.search.global.GetCurrentExperimentIdsResponse; -import com.google.android.gms.search.global.GetGlobalSearchSourcesRequest; -import com.google.android.gms.search.global.GetGlobalSearchSourcesResponse; -import com.google.android.gms.search.global.GetPendingExperimentIdsRequest; -import com.google.android.gms.search.global.GetPendingExperimentIdsResponse; -import com.google.android.gms.search.global.SetExperimentIdsRequest; -import com.google.android.gms.search.global.SetExperimentIdsResponse; -import com.google.android.gms.search.global.SetIncludeInGlobalSearchRequest; -import com.google.android.gms.search.global.SetIncludeInGlobalSearchResponse; -import com.google.android.gms.search.global.internal.IGlobalSearchAdminCallbacks; -import com.google.android.gms.search.global.internal.IGlobalSearchAdminService; - -public class GlobalSearchAdminImpl extends IGlobalSearchAdminService.Stub { - private static final String TAG = "GmsIcingGlobalImpl"; - - @Override - public void getGlobalSearchSources(GetGlobalSearchSourcesRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException { - Log.d(TAG, "getGlobalSearchSources: " + request); - callbacks.onGetGlobalSearchSourcesResponse(new GetGlobalSearchSourcesResponse(Status.SUCCESS, new Parcelable[0])); - } - - @Override - public void setExperimentIds(SetExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException { - Log.d(TAG, "setExperimentIds: " + request); - callbacks.onSetExperimentIdsResponse(new SetExperimentIdsResponse(Status.SUCCESS)); - } - - @Override - public void getCurrentExperimentIds(GetCurrentExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException { - Log.d(TAG, "getCurrentExperimentIds: " + request); - callbacks.onGetCurrentExperimentIdsResponse(new GetCurrentExperimentIdsResponse(Status.SUCCESS, new int[0])); - } - - @Override - public void getPendingExperimentIds(GetPendingExperimentIdsRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException { - Log.d(TAG, "getPendingExperimentIds: " + request); - callbacks.onGetPendingExperimentIdsResponse(new GetPendingExperimentIdsResponse(Status.SUCCESS, new int[0])); - } - - @Override - public void setIncludeInGlobalSearch(SetIncludeInGlobalSearchRequest request, IGlobalSearchAdminCallbacks callbacks) throws RemoteException { - Log.d(TAG, "setIncludeInGlobalSearch: " + request); - callbacks.onSetIncludeInGlobalSearchResponse(new SetIncludeInGlobalSearchResponse(Status.SUCCESS)); - } - - @Override - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (super.onTransact(code, data, reply, flags)) return true; - Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); - return false; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java b/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java deleted file mode 100644 index 6401e6ab..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.common.api.CommonStatusCodes; -import com.google.android.gms.common.internal.GetServiceRequest; -import com.google.android.gms.common.internal.IGmsCallbacks; - -import org.microg.gms.BaseService; -import org.microg.gms.common.GmsService; - -public class IndexService extends BaseService { - private AppDataSearchImpl appDataSearch = new AppDataSearchImpl(); - private GlobalSearchAdminImpl globalSearchAdmin = new GlobalSearchAdminImpl(); - private SearchCorporaImpl searchCorpora = new SearchCorporaImpl(); - private SearchQueriesImpl searchQueries = new SearchQueriesImpl(); - - public IndexService() { - super("GmsIcingIndexSvc", - GmsService.INDEX, GmsService.SEARCH_ADMINISTRATION, GmsService.SEARCH_CORPORA, - GmsService.SEARCH_GLOBAL, GmsService.SEARCH_IME, GmsService.SEARCH_QUERIES); - } - - @Override - public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException { - switch (service) { - case INDEX: - callback.onPostInitComplete(0, appDataSearch.asBinder(), null); - break; - case SEARCH_ADMINISTRATION: - Log.w(TAG, "Service not yet implemented: " + service); - callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); - break; - case SEARCH_QUERIES: - callback.onPostInitComplete(0, searchQueries.asBinder(), null); - break; - case SEARCH_GLOBAL: - callback.onPostInitComplete(0, globalSearchAdmin.asBinder(), null); - break; - case SEARCH_CORPORA: - callback.onPostInitComplete(0, searchCorpora.asBinder(), null); - break; - case SEARCH_IME: - Log.w(TAG, "Service not yet implemented: " + service); - callback.onPostInitComplete(CommonStatusCodes.ERROR, null, null); - break; - } - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java deleted file mode 100644 index 554d86a4..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.Parcel; -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.appdatasearch.UsageInfo; -import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearch; -import com.google.android.gms.appdatasearch.internal.ILightweightAppDataSearchCallbacks; - -import java.util.Arrays; - -public class LightweightAppDataSearchImpl extends ILightweightAppDataSearch.Stub { - private static final String TAG = "GmsIcingLightSearchImpl"; - - public void view(ILightweightAppDataSearchCallbacks callbacks, String packageName, UsageInfo[] usageInfos) { - Log.d(TAG, "view: " + Arrays.toString(usageInfos)); - } - - @Override - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (super.onTransact(code, data, reply, flags)) return true; - Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); - return false; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java b/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java deleted file mode 100644 index 2715c6ba..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.RemoteException; - -import com.google.android.gms.common.internal.GetServiceRequest; -import com.google.android.gms.common.internal.IGmsCallbacks; - -import org.microg.gms.BaseService; -import org.microg.gms.common.GmsService; - -public class LightweightIndexService extends BaseService { - private LightweightAppDataSearchImpl appDataSearch = new LightweightAppDataSearchImpl(); - - public LightweightIndexService() { - super("GmsIcingLightIndexSvc", GmsService.LIGHTWEIGHT_INDEX); - } - - @Override - public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException { - callback.onPostInitComplete(0, appDataSearch.asBinder(), null); - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java deleted file mode 100644 index fa61dedb..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/SearchCorporaImpl.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.Parcel; -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.appdatasearch.CorpusStatus; -import com.google.android.gms.common.api.Status; -import com.google.android.gms.search.corpora.ClearCorpusRequest; -import com.google.android.gms.search.corpora.GetCorpusInfoRequest; -import com.google.android.gms.search.corpora.GetCorpusStatusRequest; -import com.google.android.gms.search.corpora.GetCorpusStatusResponse; -import com.google.android.gms.search.corpora.RequestIndexingRequest; -import com.google.android.gms.search.corpora.RequestIndexingResponse; -import com.google.android.gms.search.corpora.internal.ISearchCorporaCallbacks; -import com.google.android.gms.search.corpora.internal.ISearchCorporaService; - -import java.util.HashMap; -import java.util.Map; - -public class SearchCorporaImpl extends ISearchCorporaService.Stub { - private static final String TAG = "GmsIcingCorporaImpl"; - - // We count the sequence number here to make clients happy. - private Map corpusSequenceNumbers = new HashMap(); - - @Override - public void requestIndexing(RequestIndexingRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException { - Log.d(TAG, "requestIndexing: " + request); - corpusSequenceNumbers.put(request.packageName + "/" + request.corpus, request.sequenceNumber); - callbacks.onRequestIndexing(new RequestIndexingResponse(Status.SUCCESS, true)); - } - - @Override - public void clearCorpus(ClearCorpusRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException { - Log.d(TAG, "clearCorpus"); - } - - @Override - public void getCorpusStatus(GetCorpusStatusRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException { - Log.d(TAG, "getCorpusStatus: " + request); - CorpusStatus status = new CorpusStatus(); - String numIndex = request.packageName + "/" + request.corpus; - if (corpusSequenceNumbers.containsKey(numIndex)) { - status.found = true; - status.lastIndexedSeqno = corpusSequenceNumbers.get(numIndex); - status.lastCommittedSeqno = status.lastIndexedSeqno; - } - callbacks.onGetCorpusStatus(new GetCorpusStatusResponse(Status.SUCCESS, status)); - } - - @Override - public void getCorpusInfo(GetCorpusInfoRequest request, ISearchCorporaCallbacks callbacks) throws RemoteException { - Log.d(TAG, "getCorpusInfo"); - } - - @Override - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (super.onTransact(code, data, reply, flags)) return true; - Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); - return false; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java deleted file mode 100644 index 2c353ab7..00000000 --- a/play-services-core/src/main/java/org/microg/gms/icing/SearchQueriesImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.icing; - -import android.os.Parcel; -import android.os.RemoteException; -import android.util.Log; - -import com.google.android.gms.common.api.Status; -import com.google.android.gms.search.queries.QueryRequest; -import com.google.android.gms.search.queries.QueryResponse; -import com.google.android.gms.search.queries.internal.ISearchQueriesCallbacks; -import com.google.android.gms.search.queries.internal.ISearchQueriesService; - -public class SearchQueriesImpl extends ISearchQueriesService.Stub { - private static final String TAG = "GmsIcingQueriesImpl"; - - @Override - public void query(QueryRequest request, ISearchQueriesCallbacks callbacks) throws RemoteException { - Log.d(TAG, "query: " + request); - callbacks.onQuery(new QueryResponse(Status.CANCELED, null)); - } - - @Override - public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException { - if (super.onTransact(code, data, reply, flags)) return true; - Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags); - return false; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java b/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java deleted file mode 100644 index b999101b..00000000 --- a/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2013-2017 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.microg.gms.mdm; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; -import android.util.Log; - -public class NetworkQualityService extends Service { - private static final String TAG = "GmsMdmQualitySvc"; - - @Override - public IBinder onBind(Intent intent) { - Log.d(TAG, "onBind: " + intent); - return null; - } -} diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java index 42f7c54c..9623e7ac 100755 --- a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java @@ -33,7 +33,6 @@ public class AboutFragment extends AbstractAboutFragment { libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak")); libraries.add(new AbstractAboutFragment.Library("org.conscrypt", "Conscrypt", "Apache License 2.0, The Android Open Source Project")); libraries.add(new AbstractAboutFragment.Library("org.microg.safeparcel", "SafeParcel", "Apache License 2.0, microG Team")); - libraries.add(new AbstractAboutFragment.Library("org.slf4j", "SLF4J", "MIT License, QOS.ch")); libraries.add(new AbstractAboutFragment.Library("com.squareup.wire", "Wire Protocol Buffers", "Apache License 2.0, Square Inc.")); } diff --git a/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java index 7a718036..a7d76f88 100755 --- a/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java +++ b/play-services-core/src/main/java/org/microg/gms/ui/GcmAdvancedFragment.java @@ -69,22 +69,22 @@ public class GcmAdvancedFragment extends ResourceSettingsFragment { if (state == 0) { int heartbeat = prefs.getHeartbeatMsFor(preference.getKey(), true); if (heartbeat == 0) { - preference.setSummary("ON / Automatic"); + preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_auto)); } else { - preference.setSummary("ON / Automatic: " + getHeartbeatString(heartbeat)); + preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_auto) + ": " + getHeartbeatString(heartbeat)); } } else if (state == -1) { - preference.setSummary("OFF"); + preference.setSummary(getString(R.string.service_status_disabled_short)); } else { - preference.setSummary("ON / Manual: " + getHeartbeatString(state * 60000)); + preference.setSummary(getString(R.string.service_status_enabled_short) + " / " + getString(R.string.gcm_status_pref_manual) + ": " + getHeartbeatString(state * 60000)); } } } private String getHeartbeatString(int heartbeatMs) { if (heartbeatMs < 120000) { - return (heartbeatMs / 1000) + " seconds"; + return (heartbeatMs / 1000) + " " + getString(R.string.gcm_status_pref_sec); } - return (heartbeatMs / 60000) + " minutes"; + return (heartbeatMs / 60000) + " " + getString(R.string.gcm_status_pref_min); } } diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/Utils.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/Utils.kt index 21153365..0d3c421b 100644 --- a/play-services-core/src/main/kotlin/org/microg/gms/ui/Utils.kt +++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/Utils.kt @@ -39,14 +39,9 @@ fun NavController.navigate(context: Context, @IdRes resId: Int, args: Bundle? = val Context.systemAnimationsEnabled: Boolean get() { - val duration: Float - val transition: Float - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - duration = Settings.Global.getFloat(contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) - transition = Settings.Global.getFloat(contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE, 1f) - } else { - duration = Settings.System.getFloat(contentResolver, Settings.System.ANIMATOR_DURATION_SCALE, 1f) - transition = Settings.System.getFloat(contentResolver, Settings.System.TRANSITION_ANIMATION_SCALE, 1f) - } + + val duration: Float = Settings.Global.getFloat(contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) + val transition: Float = Settings.Global.getFloat(contentResolver, Settings.Global.TRANSITION_ANIMATION_SCALE, 1f) + return duration != 0f && transition != 0f } \ No newline at end of file diff --git a/play-services-core/src/main/res/drawable-xxxhdpi/ic_magnify.png b/play-services-core/src/main/res/drawable-xxxhdpi/ic_magnify.png deleted file mode 100755 index 28456073..00000000 Binary files a/play-services-core/src/main/res/drawable-xxxhdpi/ic_magnify.png and /dev/null differ diff --git a/play-services-core/src/main/res/layout/ask_gcm.xml b/play-services-core/src/main/res/layout/ask_gcm.xml index a5c20212..33be0e7b 100755 --- a/play-services-core/src/main/res/layout/ask_gcm.xml +++ b/play-services-core/src/main/res/layout/ask_gcm.xml @@ -16,19 +16,18 @@ + app:tint="?attr/colorAccent"> - - - + - + diff --git a/play-services-core/src/main/res/layout/device_registration_fragment.xml b/play-services-core/src/main/res/layout/device_registration_fragment.xml index 0f0648dc..4b47b5fe 100755 --- a/play-services-core/src/main/res/layout/device_registration_fragment.xml +++ b/play-services-core/src/main/res/layout/device_registration_fragment.xml @@ -28,7 +28,7 @@ layout="@layout/preference_switch_bar" app:callback="@{switchBarCallback}" app:checked="@{checkinEnabled}" - app:description='@{"Register device"}' + app:description='@{@string/pref_switcher_title}' app:enabled="@{true}" /> - - - - - - - - - - - - - diff --git a/play-services-core/src/main/res/layout/push_notification_fragment.xml b/play-services-core/src/main/res/layout/push_notification_fragment.xml index e9611b83..4cf48176 100755 --- a/play-services-core/src/main/res/layout/push_notification_fragment.xml +++ b/play-services-core/src/main/res/layout/push_notification_fragment.xml @@ -32,7 +32,7 @@ layout="@layout/preference_switch_bar" app:callback="@{switchBarCallback}" app:checked="@{gcmEnabled}" - app:description='@{"Receive push notifications"}' + app:description='@{@string/pref_gcm_switcher_title}' app:enabled="@{checkinEnabled}" /> - - - - - \ No newline at end of file diff --git a/play-services-core/src/main/res/navigation/nav_settings.xml b/play-services-core/src/main/res/navigation/nav_settings.xml index eac87efd..1ada352c 100755 --- a/play-services-core/src/main/res/navigation/nav_settings.xml +++ b/play-services-core/src/main/res/navigation/nav_settings.xml @@ -2,7 +2,6 @@ Google Cloud Messaging Deaktiviert - Aktiviert Automatisch Erweitert @@ -61,11 +60,6 @@ Dies kann einige Minuten dauern." - System - - Batterieoptimierung deaktiviert: - Hier drücken um Batterieoptimierungen für microG zu deaktivieren. Wenn das nicht geschieht funktionieren einige Apps nicht ordnungsgemäß. - Infos @@ -86,13 +80,11 @@ Dies kann einige Minuten dauern." Konto Google Konto hinzufügen Google Cloud Messaging ist ein Push-Nachrichten-Dienst, der von vielen Apps genutzt wird. Zur Benutzung muss Geräte Check-In aktiviert werden. - Apps die Cloud Messaging benutzen Neue Apps bestätigen Frage nach bevor neue Apps sich für Push-Nachrichten registrieren Über microG Services Core Abmelden - Nicht registriert Bisher keine Nachrichten erhalten Letzte Nachricht: %1$s Registriert @@ -104,8 +96,4 @@ Dies kann einige Minuten dauern." Nicht verbunden Verbunden seit %1$s - offizieller Server - Dritt-Server - selbst-signiertes Zertifikat - diff --git a/play-services-core/src/main/res/values-fr/strings.xml b/play-services-core/src/main/res/values-fr/strings.xml index c7422cd2..17f364ec 100755 --- a/play-services-core/src/main/res/values-fr/strings.xml +++ b/play-services-core/src/main/res/values-fr/strings.xml @@ -47,7 +47,6 @@ Ceci peut prendre plusieurs minutes." Google Cloud Messaging Désactivé - Activé Automatique Avancé @@ -60,11 +59,6 @@ Ceci peut prendre plusieurs minutes." - Système - - Optimisations de la batterie ignorées : - Appuyez ici pour désactiver les optimisations de la batterie. Des applications peuvent mal se comporter si vous ne le faites pas. - À propos @@ -83,14 +77,12 @@ Ceci peut prendre plusieurs minutes." Si désactivé, l’utilisateur est interrogé avant que la demande d’autorisation d’une application soit envoyée à Google. Certaines applications échoueront à utiliser le compte Google si ceci est désactivé. Google Cloud Messaging est un fournisseur de notifications push utilisé par beaucoup d’applications tierces. Pour l’utiliser vous devez activer l’enregistrement du terminal. - Applications utilisant Google Cloud Messaging Confirmation pour les nouvelles applications Demander avant d’enregistrer une nouvelle application auprès de Google Cloud Messaging À propos de microG Services Core Désenregistrer - Non enregistrée Aucun message reçu pour l’instant Dernier message : %1$s Enregistrée diff --git a/play-services-core/src/main/res/values-it/arrays.xml b/play-services-core/src/main/res/values-it/arrays.xml new file mode 100644 index 00000000..88367dc3 --- /dev/null +++ b/play-services-core/src/main/res/values-it/arrays.xml @@ -0,0 +1,45 @@ + + + + + + + -1 + 0 + 1 + 2 + 5 + 10 + 15 + 20 + 30 + + + + @string/service_status_disabled + @string/service_status_automatic + + + Intervallo ping: 60 secondi + Intervallo ping: 2 minuti + Intervallo ping: 5 minuti + Intervallo ping: 10 minuti + Intervallo ping: 15 minuti + Intervallo ping: 20 minuti + Intervallo ping: 30 minuti + + \ No newline at end of file diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml index 147094b6..ab264d5c 100755 --- a/play-services-core/src/main/res/values-it/strings.xml +++ b/play-services-core/src/main/res/values-it/strings.xml @@ -53,11 +53,10 @@ Questa operazione può richiedere alcuni minuti." Registrazione del dispositivo Messaggistica cloud - Disabilitato - Abilitato + Disattivato Automatico - Abilitato - Disabilitato + Attivo + Disattivato Impostazioni avanzate Nessuna @@ -70,8 +69,11 @@ Questa operazione può richiedere alcuni minuti." - Ottimizzazioni della batteria abilitate - Hai abilitato il servizio di messaggistica cloud di Google, tuttavia le ottimizzazioni della batteria sono abilitate per microG. Al fine di garantire la ricezione delle notisfiche push, dovresti selezionare l\'opzione per ignorare le ottimizzazioni della batteria. + A proposito di microG + Servizi Google + + Ottimizzazioni della batteria attive + Hai attivato il servizio di messaggistica cloud di Google, tuttavia le ottimizzazioni della batteria sono attive per microG. Al fine di garantire la ricezione delle notisfiche push, dovresti selezionare l\'opzione per ignorare le ottimizzazioni della batteria. Ignora ottimizzazioni Preferenze dell\'account @@ -79,10 +81,11 @@ Questa operazione può richiedere alcuni minuti." Accesso e sicurezza Dai fiducia a Google per i permessi alle applicazioni - Quando questa opzione è disabilitata, viene interpellato l\'utente prima che ogni richiesta di autorizzazione da parte delle applicazioni venga inviata a Google. Alcune applicazioni potrebbero fallire nell\'utilizzare l\'account Google se questa opzione è disabilitata. + Quando questa opzione è disattivata, viene interpellato l\'utente prima che ogni richiesta di autorizzazione da parte delle applicazioni venga inviata a Google. Alcune applicazioni potrebbero fallire nell\'utilizzare l\'account Google se questa opzione è disattivata. Autorizza le applicazioni a visualizzare gli account - Quando questa opzione è abilitata, tutte le applicazioni su questo dispositivo saranno in grado di visualizzare gli indirizzi di posta elettronica dell\'account Google senza autorizzazione preventiva. + Quando questa opzione è attiva, tutte le applicazioni su questo dispositivo saranno in grado di visualizzare gli indirizzi di posta elettronica dell\'account Google senza autorizzazione preventiva. + Registra dispositivo Registra il tuo dispositivo ai servizi Google e crea un identificativo univoco. Vengono rimossi da microG alcuni bit funzionali all\'identificazione dai dati di registrazione, oltre al nome dell\'account Google. Non registrato @@ -93,15 +96,18 @@ Questa operazione può richiedere alcuni minuti." Account Aggiungi un account Google - Il servizio di messaggistica cloud di Google è un fornitore di notifiche push utilizzato da molte applicazioni di terze parti. Per poterlo utlizzare devi abilitare la registrazione del dispositivo. - Applicazioni che utilizzano il servizio di messaggistica cloud di Google + Ricevi notifiche push + Il servizio di messaggistica cloud di Google è un fornitore di notifiche push utilizzato da molte applicazioni di terze parti. Per poterlo utlizzare devi attivare la registrazione del dispositivo. Conferma le nuove applicazioni Chiedi conferma all\'utente prima di registrare una nuova applicazione per le notifiche push. A proposito di microG - + + Automatico + Manuale + secondi + minuti Annulla la registrazione - Non registrata Nessun messaggio ricevuto fino ad ora Ultimo messaggio: %1$s Registrata @@ -117,6 +123,7 @@ Questa operazione può richiedere alcuni minuti." Permetti all\'applicazione di registrarsi per la ricezione delle notifiche push. Avvia alla ricezione Avvia l\'applicazione in background in seguito alla ricezione delle notifiche push. + Stato Applicazioni che utilizzano le notifiche push Applicazioni registrate Applicazioni non registrate diff --git a/play-services-core/src/main/res/values-pl/strings.xml b/play-services-core/src/main/res/values-pl/strings.xml index b28f2e85..3fa35ec7 100755 --- a/play-services-core/src/main/res/values-pl/strings.xml +++ b/play-services-core/src/main/res/values-pl/strings.xml @@ -47,7 +47,6 @@ To zajmie kilka minut. Google Cloud Messaging Nieaktywny - Aktywny Automatyczny Zaawansowane @@ -60,11 +59,6 @@ To zajmie kilka minut. - System - - Ignorowanie optymalizacji baterii: - Dotknji, aby wyłączyć optymalizację baterii. W przeciwnym razie aplikacje mogą nie działać prawidłowo. - O programie @@ -83,14 +77,12 @@ To zajmie kilka minut. Po wyłączeniu, do użytkownika kierowane jest pytanie przed wysyłaniem prośby o autoryzację do Google. Niektóre aplikacje nie będą mogły skorzystać z konta Google po wyłączeniu tej opcji. Google Cloud Messaging jest systemem zapewniającym powiadomienia dla wielu aplikacji. Aby z niego korzystać, musisz uruchomić zgłaszanie urządzenia. - Aplikacje korzystające z Google Cloud Messaging Potwierdź nowe aplikacje Zapytaj przed zarejestrowaniem nowej aplikacji w usłudze powiadomień ‘push’ O usłudze Vanced microG Wyrejestruj - Niezarejestrowany Jak dotąd nie otrzymano wiadomości Ostatnia wiadomość: %1$s Zarejestrowany diff --git a/play-services-core/src/main/res/values-pt-rBR/strings.xml b/play-services-core/src/main/res/values-pt-rBR/strings.xml index 9f8d406c..b0b23e2f 100755 --- a/play-services-core/src/main/res/values-pt-rBR/strings.xml +++ b/play-services-core/src/main/res/values-pt-rBR/strings.xml @@ -55,11 +55,6 @@ Isso pode demorar alguns minutos." - Sistema - - Otimização de bateria ignorada: - Toque aqui para desativar as otimização da bateria. Não fazer isso pode resultar em aplicativos com má execução. - Sobre @@ -75,11 +70,9 @@ Isso pode demorar alguns minutos." Quando desabilitado, o usuário é solicitado antes que uma solicitação de autorização de apps seja enviada ao Google. Algumas aplicações deixarão de utilizar a Conta Google se esta estiver desativada. O Google Cloud Messaging é um provedor de notificação push usado por muitos aplicativos de terceiros. Para usá-lo, você deve ativar o registro do dispositivo. - Aplicativos que usam o Google Cloud Messaging Sobre microG Services Core Cancelar registro - Não registrado Nenhuma mensagem recebida até agora Última mensagem: %1$s Registrado diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml index 9ceaa714..7315c863 100755 --- a/play-services-core/src/main/res/values-ru/strings.xml +++ b/play-services-core/src/main/res/values-ru/strings.xml @@ -55,8 +55,7 @@ Google Cloud Messaging Выключено - Активно - Автоматически + Автоматически Дополнительно Пусто @@ -68,11 +67,6 @@ - Система - - Оптимизация энергопотребления отключена: - Нажмите здесь, чтобы разрешить приложению работать в фоне. Без этого некоторые приложения могут работать со сбоями - О программе @@ -93,14 +87,12 @@ Аккаунт Добавить аккаунт Google Google Cloud Messaging предоставляет push-уведомления, которые используются во многих в сторонних приложениях. Чтобы использовать их, вы должны включить регистрацию устройства. - Приложения, использующие Google Cloud Messaging Подтверждать новые приложения Спрашивать разрешение перед привязкой новых приложений для получения push-уведомлений О сервисах Vanced microG Отвязать - Не привязано Сообщения еще не были получены Последнее сообщение: %1$s Привязано diff --git a/play-services-core/src/main/res/values-sr/strings.xml b/play-services-core/src/main/res/values-sr/strings.xml index 0898464b..07cd9b5c 100755 --- a/play-services-core/src/main/res/values-sr/strings.xml +++ b/play-services-core/src/main/res/values-sr/strings.xml @@ -55,11 +55,6 @@ - Систем - - Игнорисана оптимизација батерије: - Тапните овде да бисте искључили оптимизацију батерије. Ако не урадите ово апликације ће можда лоше да се понашају - О програму @@ -75,11 +70,9 @@ Ако је искључено корисник ће бити упитан пре него се захтев за овлашћењем апликација пошаље Гуглу. Неке апликације неће моћи да користе Гуглов налог ако је ово искључено. Гуглове облак поруке (Google Cloud Messaging) је провајдер гураних обавештења (push) којег користе многе апликације. Да бисте га користили укључите пријаву уређаја. - Апликације које користе Гуглове облак поруке О језгру микроГ услуга Одјави - Није пријављена Ниједна примљена порука до сад Последња порука: %1$s Пријављена diff --git a/play-services-core/src/main/res/values-uk/strings.xml b/play-services-core/src/main/res/values-uk/strings.xml index dac8e22e..cc63d7f4 100755 --- a/play-services-core/src/main/res/values-uk/strings.xml +++ b/play-services-core/src/main/res/values-uk/strings.xml @@ -54,7 +54,6 @@ Google Cloud Messaging Вимкнуто - Увімкнуто Автоматично Додатково @@ -67,11 +66,6 @@ - Система - - Ігнорування оптимізації енергоспоживання: - Торкніться тут, аби вимкнути оптимізацію енергоспоживання. Якщо цього не зробити, додаток працюватиме не коректно в фоновому режимі. - Про @@ -90,14 +84,12 @@ Коли вимкнено, у користувача запитується дозвіл на авторизацію Google. Деякі додатки не можуть використовувати обліковий запис Google, без даної можливості. Google Cloud Messaging надає push-сповіщення, які використовуються в багатьох сторонніх додатках. Аби використовувати їх, ви повинні увімкнути реєстрацію пристрою. - Додатки, які використовують Google Cloud Messaging Підтверджувати нові додатки Запитувати перед реєстрацією нового додатку для отримання push-повідомлень Про Vanced microG Відв\'язати - Не прив\'язано Повідомлення ще не отримано Крайне повідомлення: %1$s Прив\'язано diff --git a/play-services-core/src/main/res/values-zh-rTW/strings.xml b/play-services-core/src/main/res/values-zh-rTW/strings.xml index d3ea98a8..014c9c1d 100755 --- a/play-services-core/src/main/res/values-zh-rTW/strings.xml +++ b/play-services-core/src/main/res/values-zh-rTW/strings.xml @@ -55,11 +55,6 @@ - 系統 - - 停用電池優化： - 點擊這裡來停用電池優化。 不這麼做可能導致程式運作不正常。 - 關於 @@ -76,11 +71,9 @@ 此功能停用時，使用者將在程式向Google請求驗證前被徵詢。 有些程式可能會因為此功能停用而無法存取Google帳號。 GCM是一個廣為第三方應用程式所採用的推播訊息供應者。 必須先註冊為Google設備才能使用。 - 使用GCM的程式 關於Vanced microG 取消註冊 - 未註冊 尚未收到任何訊息 最後收到訊息：%1$s 已註冊 diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index 98fbb870..644cdf88 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -55,7 +55,6 @@ This can take a couple of minutes." Google Cloud Messaging Disabled - Enabled Automatic On Off @@ -69,13 +68,6 @@ This can take a couple of minutes." Roaming Other networks - - - System - - Battery optimizations ignored: - Touch here to disable battery optimizations. Not doing this may result in misbehaving applications. - About @@ -100,18 +92,22 @@ This can take a couple of minutes." Account Add Google account + Receive push notifications Google Cloud Messaging is a push notification provider used by many third-party applications. To use it you must enable device registration. - Apps using Google Cloud Messaging Confirm new apps Ask before registering a new app to receive push notifications About Vanced microG + Register device Registers your device to Google services and creates a unique device identifier. Vanced microG strips identifying bits other than your Google account name from registration data. Status + Automatic + Manual + seconds + minutes Unregister - Not registered No messages received so far Last message: %1$s Registered @@ -127,13 +123,10 @@ This can take a couple of minutes." Allow the app to register for push notifications. Start app on push message Start the app while in background to receive the incoming push messages. + Status Apps using push notifications Registered apps Unregistered apps Networks to use for push notifications - official server - third-party server - self-signed certificate - diff --git a/play-services-core/src/main/res/xml/preferences_gcm.xml b/play-services-core/src/main/res/xml/preferences_gcm.xml deleted file mode 100755 index bcfc63bb..00000000 --- a/play-services-core/src/main/res/xml/preferences_gcm.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/play-services-core/src/main/res/xml/preferences_push_notifications.xml b/play-services-core/src/main/res/xml/preferences_push_notifications.xml index e9384ea5..3e1201fc 100755 --- a/play-services-core/src/main/res/xml/preferences_push_notifications.xml +++ b/play-services-core/src/main/res/xml/preferences_push_notifications.xml @@ -28,7 +28,7 @@