diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt index fa415f43..11fea02c 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/downloadLogs/DownloadLogListActivity.kt @@ -102,8 +102,10 @@ class DownloadLogListActivity : AppCompatActivity(), DownloadLogsAdapter.OnItemC fileList = mutableListOf() try{ fileList.addAll(logFolder.listFiles()!!) - fileList.sortByDescending { it.name } - }catch (ignored: Exception){} + fileList.sortByDescending { it.name.split(" -")[0].toInt() } + }catch (e: Exception){ + e.printStackTrace() + } downloadLogAdapter.submitList(fileList.toList()) runOnUiThread{ if (fileList.isNotEmpty()) { diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt index b309f64e..ec264e71 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/more/settings/SettingsFragment.kt @@ -16,6 +16,7 @@ import androidx.preference.* import androidx.work.WorkInfo import androidx.work.WorkManager import com.deniscerri.ytdlnis.BuildConfig +import com.deniscerri.ytdlnis.MainActivity import com.deniscerri.ytdlnis.R import com.deniscerri.ytdlnis.util.FileUtil import com.deniscerri.ytdlnis.util.UpdateUtil @@ -291,14 +292,13 @@ class SettingsFragment : PreferenceFragmentCompat() { dialog.cancel() } .setPositiveButton(resources.getString(R.string.restart)) { dialog, which -> - val i: Intent = - requireContext().packageManager.getLaunchIntentForPackage( - requireContext().packageName - )!! - i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - startActivity(i) - requireActivity().finish() - dialog.cancel() + val intent = Intent(context, MainActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + requireContext().startActivity(intent) + if (context is Activity) { + (context as Activity).finish() + } + Runtime.getRuntime().exit(0) } .show() diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index e5fecf00..51da3b77 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -80,9 +80,9 @@