Skip to content

Commit 67eeb93

Browse files
committed
Update
1 parent 014df8c commit 67eeb93

2 files changed

Lines changed: 7 additions & 20 deletions

File tree

app/src/main/java/com/tool/tree/CrashHandler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ public void uncaughtException(Thread thread, Throwable ex) {
2525

2626
Intent intent = new Intent(context, CrashLogActivity.class);
2727
intent.putExtra("crash_log", stackTrace);
28-
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
29-
| Intent.FLAG_ACTIVITY_CLEAR_TASK);
28+
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
29+
| Intent.FLAG_ACTIVITY_CLEAR_TASK
30+
| Intent.FLAG_ACTIVITY_CLEAR_TOP);
3031

3132
context.startActivity(intent);
3233

app/src/main/java/com/tool/tree/MainActivity.kt

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ class MainActivity : AppCompatActivity() {
8383
val tab4Items = getItems(krScriptConfig.customTab4Config)
8484

8585
withContext(Dispatchers.Main) {
86-
// Kiểm tra xem Activity còn tồn tại không trước khi cập nhật UI
87-
if (!isActive || isFinishing) return@withContext
88-
8986
progressBarDialog.hideDialog()
90-
9187
if (!::adapter.isInitialized) {
9288
adapter = MainPagerAdapter(this@MainActivity)
9389
binding.viewPager.adapter = adapter
@@ -132,8 +128,6 @@ class MainActivity : AppCompatActivity() {
132128
val tab4Items = getItems(krScriptConfig.customTab4Config)
133129

134130
withContext(Dispatchers.Main) {
135-
if (!isActive || isFinishing) return@withContext
136-
137131
if (!favorites.isNullOrEmpty()) (adapter.getFragment(0) as? ActionListFragment)?.updateData(favorites, getKrScriptActionHandler(krScriptConfig.favoriteConfig, true), ThemeModeState.getThemeMode())
138132
if (!pages.isNullOrEmpty()) (adapter.getFragment(1) as? ActionListFragment)?.updateData(pages, getKrScriptActionHandler(krScriptConfig.pageListConfig, false), ThemeModeState.getThemeMode())
139133
if (!tab3Items.isNullOrEmpty()) (adapter.getFragment(2) as? ActionListFragment)?.updateData(tab3Items, getKrScriptActionHandler(krScriptConfig.customTab3Config, false), ThemeModeState.getThemeMode())
@@ -171,20 +165,12 @@ class MainActivity : AppCompatActivity() {
171165
* Lấy danh sách item từ cấu hình trang.
172166
* Đã thêm kiểm tra null-safety để tránh NullPointerException.
173167
*/
174-
private fun getItems(pageNode: PageNode?): ArrayList<NodeInfoBase>? {
175-
if (pageNode == null) return null
176-
168+
private fun getItems(pageNode: PageNode): ArrayList<NodeInfoBase>? {
177169
var items: ArrayList<NodeInfoBase>? = null
178-
179-
// Sử dụng ?. để truy cập thuộc tính an toàn
180-
if (pageNode.pageConfigSh?.isNotEmpty() == true) {
170+
if (pageNode.pageConfigSh.isNotEmpty())
181171
items = PageConfigSh(this, pageNode.pageConfigSh, null).execute()
182-
}
183-
184-
if (items == null && pageNode.pageConfigPath?.isNotEmpty() == true) {
172+
if (items == null && pageNode.pageConfigPath.isNotEmpty())
185173
items = PageConfigReader(this.applicationContext, pageNode.pageConfigPath, null).readConfigXml()
186-
}
187-
188174
return items
189175
}
190176

@@ -305,7 +291,7 @@ class MainActivity : AppCompatActivity() {
305291
themeSelector.text = themeNames[position]
306292
popup.dismiss()
307293
}
308-
popup.width = 490
294+
popup.width = 500
309295
popup.show()
310296
}
311297

0 commit comments

Comments
 (0)