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

test new singin #45

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

test new singin #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35bd4f0
Fix for new sign up from Niantic
modos189 Feb 13, 2024
5524ebb
Bump versions
modos189 Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/total-conversion-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @author jonatkins
// @name IITC: Ingress intel map total conversion
// @version 0.37.1
// @version 0.37.2
// @description Total conversion for the ingress intel map.
// @run-at document-end

Expand Down
2 changes: 1 addition & 1 deletion mobile/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
minSdkVersion 17
targetSdkVersion 29
versionCode = getVersionCodeTimeStamps()
versionName "0.37.1"
versionName "0.37.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
signingConfigs {
Expand Down
1 change: 1 addition & 0 deletions mobile/app/src/main/java/org/exarhteam/iitc_mobile/IITC_Mobile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ protected void onCreate(final Bundle savedInstanceState) {
mAllowedHostnames.put("google.com", googleUA);
mAllowedHostnames.put("youtube.com", googleUA);
mAllowedHostnames.put("facebook.com", mDesktopUA);
mAllowedHostnames.put("signin.nianticlabs.com", mIITCDefaultUA);

// enable progress bar above action bar
// must be called BEFORE calling parent method
Expand Down
7 changes: 6 additions & 1 deletion mobile/app/src/main/java/org/exarhteam/iitc_mobile/IITC_WebViewClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,15 @@ public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
}
if (uriHost.startsWith("accounts.google.") ||
uriHost.startsWith("appengine.google.") ||
uriHost.startsWith("accounts.youtube.")) {
uriHost.startsWith("accounts.youtube.") ||
uriHost.startsWith("myaccount.google.")) {
Log.d("Google login");
return false;
}
if (uriHost.startsWith("signin.nianticlabs.")) {
Log.d("Niantic login");
return false;
}
if (mIitc.isInternalHostname(uriHost)) {
Log.d("internal host");
return false;
Expand Down
8 changes: 7 additions & 1 deletion mobile/app/src/main/java/org/exarhteam/iitc_mobile/IITC_WebViewPopup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,17 @@ public boolean shouldOverrideUrlLoading(final WebView view, final String url) {
}
if (uriHost.startsWith("accounts.google.") ||
uriHost.startsWith("appengine.google.") ||
uriHost.startsWith("accounts.youtube.")) {
uriHost.startsWith("accounts.youtube.") ||
uriHost.startsWith("myaccount.google.")) {
Log.d("popup: Google login");
openDialogPopup();
return false;
}
if (uriHost.startsWith("signin.nianticlabs.")) {
Log.d("popup: Niantic login");
openDialogPopup();
return false;
}
if (mIitc.isInternalHostname(uriHost)) {
Log.d("popup: internal host");
openDialogPopup();
Expand Down