NEW Support for Google OAUTH2 openid connect to avoid to leave DoliDr…

…oid.
DoliCloud · Jul 2, 2023 · ee098e5 · ee098e5
1 parent 635c455
commit ee098e5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,18 +5,19 @@ English DoliDroid ChangeLog
 ***** ChangeLog for 3.0 *****
 
 3.0-b57
-- Add a page to manage favorites connections. Can remove one or all connections.
+- NEW Add a page to manage favorites connections. Can remove one or all connections.
+- NEW Support for Google OAUTH2 openid connect to avoid to leave DoliDroid.
 
 3.0-b56
-- Fix null pointer error on "Copy current URL" feature.
+- FIX null pointer error on "Copy current URL" feature.
 - Reorganize menus to prepare future features
 - Add menu entry "Virtual business card" for future Dolibarr v18
 
 3.0-b55
-- Fix the wheel on long pages
+- FIX the wheel on long pages
 
 3.0-b54
-- Fix error on small screen.
+- FIX error on small screen.
 
 3.0-b53
 - Add a refresh of page on swipe down.

diff --git a/app/build.gradle b/app/build.gradle
@@ -31,7 +31,7 @@ android {
 
 dependencies {
  // Add entry to be able to use androidx.core.content.FileProvider to use Provider for file upload of camera capture on Android >= 30
- implementation 'androidx.core:core:1.7.0'
+ implementation 'androidx.core:core:1.10.1'
 
  implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 

diff --git a/app/src/main/java/com/nltechno/dolidroidpro/SecondActivity.java b/app/src/main/java/com/nltechno/dolidroidpro/SecondActivity.java
@@ -1853,8 +1853,11 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
  } catch (Exception ex) {
  }
  return true;
- } else if (! url.startsWith(savedDolBasedUrl) && ! url.startsWith(savedDolBasedUrlWithSForced)) { // This is an external url
- Log.d(LOG_TAG, "Launch external url in default browser : " + url);
+ } else if (! url.startsWith(savedDolBasedUrl) && ! url.startsWith(savedDolBasedUrlWithSForced)
+ && ! url.startsWith(savedDolBasedUrlWithoutUserInfo) && ! url.startsWith(savedDolBasedUrlWithoutUserInfoWithSForced)
+ && ! url.startsWith("https://accounts.google.com/o/oauth2/"))
+ { // This is an external url
+ Log.d(LOG_TAG, "Launch external url in the default browser : " + url);
  try {
  Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
  startActivity(intent);

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.android.tools.build:gradle:8.0.2'
  }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx2048M
 # Add entry to be able to use androidx methods (required for EncryptedSharedPreferences)
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false