Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upstream merge #1

Merged
merged 45 commits into from
Sep 25, 2023
Merged

Upstream merge #1

merged 45 commits into from
Sep 25, 2023

Conversation

Daviteusz
Copy link

@Daviteusz Daviteusz commented Sep 23, 2023 •
edited
Loading

I resolved repo incompatibility and translated two items in -base

mar-v-in and others added 30 commits August 29, 2023 11:33
@mar-v-in
Add details of Google Certificate lookup API
839248f
@mar-v-in
Location: Handle rare sidecases
ecfc7c7 
Fixes microg#1963, microg#2005
@mar-v-in
Move phenotype in own module
4d5f6bd
@mar-v-in
Maps: identify bitmaps by hash
fc00907 
Needs slightly more time if apps take care of only registering one bitmap once but saves a lot of time and memory when they don't (and many don't)
@mar-v-in
Auth: Add a bunch of Sign-In related code
31eadb3
@mar-v-in
Location: Add support for locating in czech trains
7f5fbe5
@mar-v-in
Fido: Update to latest API version features
046218e 
Also handle empty strings from apps as none.

Fixes microg#2021, microg#2022
@mar-v-in
Games: Add initial basic support for Play Games
40269ab 
This puts the base to allow apps that allow/require sign in with Google Play Games to work.
Note that as the Play Games companion app is not functional (yet), many features of Play Games remain unusable.
@ale5000-git @mar-v-in
Keep Conscrypt classes in the primary dex file otherwise it will erro…
640be73 
…r out on legacy Android versions, fix microg#2023
@ale5000-git @mar-v-in
Keep Dynamite Loader in the primary dex file otherwise it will error …
16c9b98 
…out on legacy Android versions
@mar-v-in
Fix account setting crash under Android < 5
1100129
@mar-v-in
Location: ask for permissions if not granted at time of request
666361a
@fynngodau @mar-v-in
Fix bugs in new styles
292666b
@mar-v-in
Push: Don't try adding app extra to network request
23d1b18 
It's a PendingIntent, so that doesn't work and spills a warning.

Fixes microg#2029
@mar-v-in
Location: Handle network location learning not possible due to lack o…
0234fee 
…f GPS

Fixes microg#2005
@mar-v-in
Maps: Fix color of some POIs, render light_rail and tram lines
a35d381
@mar-v-in
Use fake-signature module
0f04df6 
This is the same as in fake-store. Soon we'll have to move FakeStore/Companion
to this repository anyway (so that it can access certain parts from core needed
to support IAP and PI), until then it's probably fine to have this code
duplicated.
@mar-v-in
Checkin: Use null serial instead of empty
ae607f1 
Server says >> "" is not a valid serial number <<, but null is fine 🤷
@mar-v-in
Fido: Add full nullability information
b3032b9 
And fix the bugs found by that
@fynngodau @mar-v-in
Fix crash with mutated callback list
4a2b5cb
@fynngodau @mar-v-in
Fix lite mode map instance restoration crash
53eb20c 
This fixes a crash in the sample app
@mar-v-in
Basement: Add back safeparcel consumer proguard rules
23080f8 
We lost them when moving from safe-parcel module
@mar-v-in
Migrate Basement/Fido SafeParcelables to use processor instead of ref…
dd77aca 
…lection

This improves speed and should help against ProGuard optimizing away our code
@mar-v-in
Base: Allow default settings to be provided in meta-data
2c80de5 
This is useful for apps that include microG as a library, so they can easily
modify the default configuration of their embedded microG.
@mar-v-in
Build: Change system for optional components
dd8c560 
- Nearby can now be configured through local build property, enabled by default
- Exposure Notifications is not displayed in settings if not used for >14 days
- Flavors per map type remain (but moved maps implementations)
@mar-v-in
Ignore exceptions in fake signature InitProvider
1f855bc
@mar-v-in
Move Vending app to GmsCore repository, add Huawei flavor for fake-si…
f5aadc3 
…gnature

Moving the vending app here is also in preparation for support for various
features that have to be provided in the com.android.vending package like
IAP, Play Integrity, Split Install, ...
@mar-v-in
Auth: Add option to authenticate without android id
8663e52 
This may limit functionality (e.g. the device might be unable to act as a
privileged device in the authentication system), but allows to register on
devices that are not registered in Google's system.
@mar-v-in
Fake Signature: Fix mechanism to update database
49f739f
@mar-v-in
Maps: Add HMS-based implementation
b192f35 
This is disabled by default, as it currently relies on a non-free library. It
can be enabled by setting modules.hms=true in local.properties. You also need
to place your agconnect-services.json and set hmsmap.key in local.properties.
mar-v-in and others added 15 commits September 19, 2023 13:18
@mar-v-in
Games: Correctly announce games services
36c82d6
@mar-v-in
Properly sign out
4f35fd1
@ale5000-git
Bump GMS version to 23.35.15 (microg#2030)
2637588
@mar-v-in
Fake Signature: Try harder to start the service
92fd0c1
@mar-v-in
Auth: Forward UID/PID from IAuthManagerService.getTokenWithAccount
4a7bac3
@mar-v-in
Location: Add support for getCurrentLocation()
d4118d7
@ale5000-git @mar-v-in
Declare com.google.android.providers.gsf.permission.READ_GSERVICES pe…
833e294 
…rmission
@mar-v-in
Cast: Fix NsdManager leak
5f8c418
@mar-v-in
People: Fix database leak
7da39d9
@mar-v-in
Remove old Transifex configuration
63e61e8
@ale5000-git @mar-v-in
Separates launcher icon from main settings activity (so it can be dis…
7b7ede9 
…abled without making microG settings inaccessible since there are launchers that doesn't allow to hide Apps on their own)
@ale5000-git @mar-v-in
Add an activity-alias for Google settings compatibility (other apps a…
af50550 
…re supposed to able to open Google settings)
@fynngodau @mar-v-in
Force no POI to show at zoom <= 14
6d4d20d
@fynngodau @mar-v-in
Align POI label colors and improve ledgebility of borders
ccb26ad
@Daviteusz
Merge remote-tracking branch 'microgmaster/master' into upstream-merge
753fbd6
@SpacingBat3
Copy link
Owner

Looks OK. I don't see any new strings translated though, I've only noticed some strings to be actually moved to -base from the previous location.

@SpacingBat3 SpacingBat3 merged commit 9556c79 into SpacingBat3:upstream-merge Sep 25, 2023
1 check failed
@SpacingBat3
Copy link
Owner

Also thx for helping me with keeping this repo fresh! I've also translated new -vending strings. I've also noticed microG is setting up localization via https://www.transifex.com/, or at least that's what newly added config suggests.

@Daviteusz
Copy link
Author

Looks OK. I don't see any new strings translated though, I've only noticed some strings to be actually moved to -base from the previous location.

Ah sorry, I translated them while resolving conflicts and this is why they hard to find :D
https://github.com/microg/GmsCore/blob/753fbd6c0aadfec1ce1a1f4b8e46fea6a297787b/play-services-base/core/src/main/res/values-pl/strings.xml#L23C7-L23C7
They were On and Off in play-services-core/src/main/res/values/strings.xml. Perhaps I should do it later as a separate commit.

Also thx for helping me with keeping this repo fresh! I've also translated new -vending strings. I've also noticed microG is setting up localization via https://www.transifex.com/, or at least that's what newly added config suggests.

At this moment, the configuration file has been deleted, so it's hard to tell 😃

@SpacingBat3
Copy link
Owner

Ah sorry, I translated them while resolving conflicts and this is why they hard to find :D microg/GmsCore@753fbd6/play-services-base/core/src/main/res/values-pl/strings.xml#L23C7-L23C7 They were On and Off in play-services-core/src/main/res/values/strings.xml. Perhaps I should do it later as a separate commit.

Wasn't that defined in play-services-core previously? The diff seems to tell this was done before (+ I remember myself localizing that before):
https://github.com/SpacingBat3/GmsCore/pull/1/files#diff-41fd28704cd51671fd8c58dbd62544ba4f5fc22f0987b8b0009917bf623adcf8L51-L57

Outside of this, I haven't noticed any changes to localizations done, so I guess this PR indeed only resolved the conflicts. But still there were some leftovers left and I'm not sure if there are any additional items added in existing locales after you merged the upstream.

@Daviteusz
Copy link
Author

Hmm... It seems that was something strange happened on my vscode and I had to add these two lines manually, I took them from -base .../values/strings.xml, I was wondering whether to translate them as Wł Wył or Wł. Wył. I selected second variant, then I pushed out changes and made this PR :D

According to the commit history this translation was already there, so in that case that's why my changes are not visible, because they are identical, so you are correct, this is only upstream merge, nothing else 😂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Daviteusz @SpacingBat3 @mar-v-in @ale5000-git @fynngodau