From 65711c22a38f5d81897518f54f0c1d899da40aa3 Mon Sep 17 00:00:00 2001 From: Rawlin C Date: Fri, 7 Jul 2023 23:55:47 +0530 Subject: [PATCH] Removed unrequired code --- .../clock/activities/MainActivity.kt | 3 -- .../clock/extensions/Context.kt | 15 +++----- .../clock/fragments/AlarmFragment.kt | 3 -- .../clock/helpers/Constants.kt | 37 ------------------- 4 files changed, 6 insertions(+), 52 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt index 115ec528..1d60852e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt @@ -10,7 +10,6 @@ import android.os.Bundle import android.view.WindowManager import android.widget.ImageView import android.widget.TextView -import androidx.lifecycle.lifecycleScope import com.simplemobiletools.clock.BuildConfig import com.simplemobiletools.clock.R import com.simplemobiletools.clock.adapters.ViewPagerAdapter @@ -20,8 +19,6 @@ import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.FAQItem import kotlinx.android.synthetic.main.activity_main.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch import me.grantland.widget.AutofitHelper class MainActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt index eb5ad7fc..2366024b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt @@ -9,6 +9,8 @@ import android.media.AudioAttributes import android.media.AudioManager.STREAM_ALARM import android.media.RingtoneManager import android.net.Uri +import android.os.Handler +import android.os.Looper import android.os.PowerManager import android.text.SpannableString import android.text.format.DateFormat @@ -311,17 +313,12 @@ fun Context.getClosestEnabledAlarmString(result: (String) -> Unit) { } fun Context.getEnabledAlarms(enabledAlarms: (List?) -> Unit) { - ensureBackgroundThreadWithResult( - task = { - dbHelper.getEnabledAlarms() - }, - callback = { alarms -> + ensureBackgroundThread { + val alarms = dbHelper.getEnabledAlarms() + Handler(Looper.getMainLooper()).post { enabledAlarms.invoke(alarms) - }, - onError = { - enabledAlarms.invoke(null) } - ) + } } fun Context.rescheduleEnabledAlarms() { diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt index 14748b3f..690f9c74 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/AlarmFragment.kt @@ -5,7 +5,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.lifecycle.lifecycleScope import com.simplemobiletools.clock.R import com.simplemobiletools.clock.activities.MainActivity import com.simplemobiletools.clock.activities.SimpleActivity @@ -24,8 +23,6 @@ import com.simplemobiletools.commons.helpers.SORT_BY_DATE_CREATED import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.models.AlarmSound import kotlinx.android.synthetic.main.fragment_alarm.view.* -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch class AlarmFragment : Fragment(), ToggleAlarmInterface { private var alarms = ArrayList() diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt index df5028bf..bc6ef0ee 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt @@ -241,40 +241,3 @@ fun getTimeDifferenceInMinutes(currentTimeInMinutes: Int, alarmTimeInMinutes: In minutesInADay - (currentTimeInMinutes - minutesUntilAlarm) } } - -/** - * Runs tasks that you want on a background thread and returns the result or error - * @param task: Callable to add code that should execute on a background thread - * @param callback: Gives back the result from the task after it has completed executing on the Main thread - * @param onError: Gives the error thrown if any by the Callable on the Main thread - */ -fun ensureBackgroundThreadWithResult( - task: Callable, - callback: (T) -> Unit, - onError: ((Throwable) -> Unit)? = null -) { - val executor = if (isOnMainThread()) { - Executors.newSingleThreadExecutor() - } else { - Executors.newFixedThreadPool(1) - } - - val handler = Handler(Looper.getMainLooper()) - - val future = executor.submit(task) - - executor.submit { - try { - val result = future.get() - handler.post { - callback(result) - } - } catch (t: Throwable) { - handler.post { - onError?.invoke(t) - } - } finally { - executor.shutdown() - } - } -}