Merge pull request #2764 from nextcloud/renovate/com.android.tools.build-gradle-8.x

fix(deps): update dependency com.android.tools.build:gradle to v8.12.0

Author: AndyScherzinger

app/build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
     compileSdk 35
-    namespace 'it.niedermann.owncloud.notes'
+    namespace = 'it.niedermann.owncloud.notes'
 
     defaultConfig {
         applicationId "it.niedermann.owncloud.notes"
@@ -29,7 +29,7 @@ android {
     }
 
     compileOptions {
-        coreLibraryDesugaringEnabled true
+        coreLibraryDesugaringEnabled = true
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
@@ -39,13 +39,13 @@ android {
     }
 
     buildFeatures {
-        viewBinding true
-        buildConfig true
+        viewBinding = true
+        buildConfig = true
     }
 
     buildTypes {
         debug {
-            testCoverageEnabled true
+            testCoverageEnabled = true
         }
 
         release {
@@ -73,17 +73,17 @@ android {
 
     testOptions {
         unitTests {
-            includeAndroidResources true
+            includeAndroidResources = true
         }
     }
 
     lintOptions {
-        abortOnError false
+        abortOnError = false
         disable 'MissingTranslation'
     }
 
     androidResources {
-        generateLocaleConfig true
+        generateLocaleConfig = true
     }
 
     packagingOptions {

app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java

@@ -33,6 +33,7 @@
 
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import it.niedermann.owncloud.notes.R;
@@ -42,7 +43,6 @@
 import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
 import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
 
 public class NoteEditFragment extends SearchableBaseNoteFragment {
 
@@ -306,7 +306,17 @@ public void applyBrand(int color) {
         super.applyBrand(color);
 
         final var util = BrandingUtil.of(color, requireContext());
-        binding.editContent.setSearchColor(color);
+
+        lifecycleScopeIOJob(() -> {
+            try {
+                final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
+                binding.editContent.setCurrentSingleSignOnAccount(ssoAccount, color);
+            } catch (Exception e) {
+                Log_OC.e(TAG, "applyBrand exception: " + e);
+            }
+            return Unit.INSTANCE;
+        });
+
         binding.editContent.setHighlightColor(util.notes.getTextHighlightBackgroundColor(requireContext(), color, colorPrimary, colorAccent));
     }
 

app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java

@@ -31,19 +31,15 @@
 
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
-import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 import com.owncloud.android.lib.common.utils.Log_OC;
 
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.FragmentNotePreviewBinding;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
 import it.niedermann.owncloud.notes.shared.util.SSOUtil;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function0;
 
 public class NotePreviewFragment extends SearchableBaseNoteFragment implements OnRefreshListener {
 
@@ -233,7 +229,17 @@ public void applyBrand(int color) {
         super.applyBrand(color);
 
         final var util = BrandingUtil.of(color, requireContext());
-        binding.singleNoteContent.setSearchColor(color);
+        
+        lifecycleScopeIOJob(() -> {
+            try {
+                final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
+                binding.singleNoteContent.setCurrentSingleSignOnAccount(ssoAccount, color);
+            } catch (Exception e) {
+                Log_OC.e(TAG, "applyBrand exception: " + e);
+            }
+            return Unit.INSTANCE;
+        });
+
         binding.singleNoteContent.setHighlightColor(util.notes.getTextHighlightBackgroundColor(requireContext(), color, colorPrimary, colorAccent));
     }
 

build.gradle

@@ -22,7 +22,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.11.1'
+        classpath 'com.android.tools.build:gradle:8.12.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -34,7 +34,7 @@ allprojects {
     repositories {
         mavenCentral()
         google()
-        maven { url "https://jitpack.io" }
+        maven { url = "https://jitpack.io" }
     }
 
 }