Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 32fd8de2 authored by LuK1337's avatar LuK1337
Browse files

Merge tag 'v1.0.52' of https://github.com/Etar-Group/Etar-Calendar into lineage-23.0 

* tag 'v1.0.52' of https://github.com/Etar-Group/Etar-Calendar:
  New version 1.0.52
  Translated using Weblate (Indonesian)
  Translated using Weblate (Welsh)
  Translated using Weblate (Chinese (Simplified Han script))
  Translated using Weblate (Croatian)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Kurdish (Central))
  Translated using Weblate (Kurdish (Central))
  Added translation using Weblate (Kurdish (Central))
  Translated using Weblate (Turkish)
  Translated using Weblate (Chinese (Traditional Han script))
  Translated using Weblate (Persian)
  Translated using Weblate (Slovak)
  Translated using Weblate (Estonian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Swedish)
  Translated using Weblate (German)
  Translated using Weblate (Italian)
  Translated using Weblate (Korean)
  Translated using Weblate (Latvian)
  Translated using Weblate (Dutch)
  Translated using Weblate (Czech)
  Translated using Weblate (Tamil)
  Translated using Weblate (Ukrainian)
  Update resources
  Bump actions/cache from 4 to 5
  Bump actions/upload-artifact from 4 to 6
  Bump actions/checkout from 4 to 6
  Bump gradle/actions from 4 to 5
  Bump actions/setup-java from 4 to 5
  Color.xml requires the theme suffix in lowercase but receives it in uppercase, which causes a crash. This fixes the error.
  Fix taping on the event from the widget open concrete event.
  Drop Android.mk
  Make parser more robust against incorrect input
  Fix ArrayIndexOutOfBoundsException Under certain unforeseen circumstances (presumably during scrolling or a rapid change of view), mFirstHour is set to -1 or is not updated to a valid value (0-23) in time before the onDraw method is called.
  Remove unused resources
  Move DynamicTheme into DynamicThemeKt
  Add outside range check
  Replace png with vector drawable
  Add missing superCall
  Use ResourcesCompat
  Remove unnecessary return
  Remove redundant assignment
  Solve lint warnings
  Remove unused imports
  Rework theme logic, remove unused code and add edge to edge support.
  Bump targetSdk to 35
  prevent dialog crash when activity is destroyed
  Revert "6430-t-Clear_notification_after_event_ends"

Change-Id: I13bdb2b83b7c3c6f95bcd0124fc7d42fd3364442
parents e17ece38 c0bdf067

app/build.gradle.kts

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ android { 


	defaultConfig {

		minSdk = 23

		targetSdk = 34

		versionCode = 51

		versionName = "1.0.51"

		targetSdk = 35

		versionCode = 52

		versionName = "1.0.52"

		applicationId = "ws.xsoh.etar"

		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

	}

app/src/main/java/com/android/calendar/AboutActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package com.android.calendar 


import android.os.Bundle

import androidx.appcompat.app.AppCompatActivity

import com.android.calendar.theme.applyThemeAndPrimaryColor

import com.android.calendar.theme.applyTheme



import ws.xsoh.etar.R

import ws.xsoh.etar.databinding.SimpleFrameLayoutMaterialBinding
@@ -10,7 +10,7 @@ import ws.xsoh.etar.databinding.SimpleFrameLayoutMaterialBinding 
class AboutActivity : AppCompatActivity() {



    override fun onCreate(savedInstanceState: Bundle?) {

        applyThemeAndPrimaryColor()

        applyTheme()

        super.onCreate(savedInstanceState)



        val binding: SimpleFrameLayoutMaterialBinding = SimpleFrameLayoutMaterialBinding.inflate(layoutInflater)

app/src/main/java/com/android/calendar/AllInOneActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH 
    @Override

    protected void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        DynamicThemeKt.applyThemeAndPrimaryColor(this);

        DynamicThemeKt.applyTheme(this);

        mActivity = this;

        // This needs to be created before setContentView

        mController = CalendarController.getInstance(this);

app/src/main/java/com/android/calendar/AsyncQueryServiceHelper.java

+2 −7
Original line number Diff line number Diff line
@@ -87,9 +87,7 @@ public class AsyncQueryServiceHelper extends IntentService { 


        synchronized (sWorkQueue) {

            // Unknown order even for a PriorityQueue

            Iterator<OperationInfo> it = sWorkQueue.iterator();

            while (it.hasNext()) {

                OperationInfo info = it.next();

            for (OperationInfo info : sWorkQueue) {

                if (info.delayMillis > 0 && lastScheduleTime < info.mScheduledTimeMillis) {

                    if (op == null) {

                        op = new Operation();
@@ -225,10 +223,7 @@ public class AsyncQueryServiceHelper extends IntentService { 
                case Operation.EVENT_ARG_BATCH:

                    try {

                        args.result = resolver.applyBatch(args.authority, args.cpo);

                    } catch (RemoteException e) {

                        Log.e(TAG, e.toString());

                        args.result = null;

                    } catch (OperationApplicationException e) {

                    } catch (RemoteException | OperationApplicationException e) {

                        Log.e(TAG, e.toString());

                        args.result = null;

                    }

app/src/main/java/com/android/calendar/CalendarController.java

+4 −6
Original line number Diff line number Diff line
@@ -362,9 +362,7 @@ public class CalendarController { 
                    handled = true;

                }

            }

            for (Iterator<Entry<Integer, EventHandler>> handlers =

                 eventHandlers.entrySet().iterator(); handlers.hasNext(); ) {

                Entry<Integer, EventHandler> entry = handlers.next();

            for (Entry<Integer, EventHandler> entry : eventHandlers.entrySet()) {

                int key = entry.getKey();

                if (mFirstEventHandler != null && key == mFirstEventHandler.first) {

                    // If this was the 'first' handler it was already handled
@@ -637,13 +635,13 @@ public class CalendarController { 
        Log.d(TAG, "Refreshing " + accounts.length + " accounts");



        String authority = Calendars.CONTENT_URI.getAuthority();

        for (int i = 0; i < accounts.length; i++) {

        for (Account account : accounts) {

            if (Log.isLoggable(TAG, Log.DEBUG)) {

                Log.d(TAG, "Refreshing calendars for: " + accounts[i]);

                Log.d(TAG, "Refreshing calendars for: " + account);

            }

            Bundle extras = new Bundle();

            extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);

            ContentResolver.requestSync(accounts[i], authority, extras);

            ContentResolver.requestSync(account, authority, extras);

        }

    }