Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
cf44be1d
There was an error fetching the commit references. Please try again later.
Commit
cf44be1d
authored
1 year ago
by
Charles Lombardo
Browse files
Options
Downloads
Patches
Plain Diff
android: Adjust failure dialogs for user data and firmware installers
parent
95a31b88
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+10
-2
10 additions, 2 deletions
...p/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
src/android/app/src/main/res/values/strings.xml
+3
-1
3 additions, 1 deletion
src/android/app/src/main/res/values/strings.xml
with
13 additions
and
3 deletions
src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+
10
−
2
View file @
cf44be1d
...
@@ -676,7 +676,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
...
@@ -676,7 +676,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
}
}
}
}
if
(!
isYuzuBackup
)
{
if
(!
isYuzuBackup
)
{
return
@newInstance
getString
(
R
.
string
.
invalid_yuzu_backup
)
return
@newInstance
MessageDialogFragment
.
newInstance
(
this
,
titleId
=
R
.
string
.
invalid_yuzu_backup
,
descriptionId
=
R
.
string
.
user_data_import_failed_description
)
}
}
// Clear existing user data
// Clear existing user data
...
@@ -689,7 +693,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
...
@@ -689,7 +693,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
File
(
DirectoryInitialization
.
userDirectory
!!
)
File
(
DirectoryInitialization
.
userDirectory
!!
)
)
)
}
catch
(
e
:
Exception
)
{
}
catch
(
e
:
Exception
)
{
return
@newInstance
getString
(
R
.
string
.
invalid_yuzu_backup
)
return
@newInstance
MessageDialogFragment
.
newInstance
(
this
,
titleId
=
R
.
string
.
import_failed
,
descriptionId
=
R
.
string
.
user_data_import_failed_description
)
}
}
// Reinitialize relevant data
// Reinitialize relevant data
...
...
This diff is collapsed.
Click to expand it.
src/android/app/src/main/res/values/strings.xml
+
3
−
1
View file @
cf44be1d
...
@@ -100,7 +100,7 @@
...
@@ -100,7 +100,7 @@
<string
name=
"firmware_installing"
>
Installing firmware
</string>
<string
name=
"firmware_installing"
>
Installing firmware
</string>
<string
name=
"firmware_installed_success"
>
Firmware installed successfully
</string>
<string
name=
"firmware_installed_success"
>
Firmware installed successfully
</string>
<string
name=
"firmware_installed_failure"
>
Firmware installation failed
</string>
<string
name=
"firmware_installed_failure"
>
Firmware installation failed
</string>
<string
name=
"firmware_installed_failure_description"
>
Verify that the ZIP contains valid firmware
and try again.
</string>
<string
name=
"firmware_installed_failure_description"
>
Make sure the firmware nca files are at the root of the zip
and try again.
</string>
<string
name=
"share_log"
>
Share debug logs
</string>
<string
name=
"share_log"
>
Share debug logs
</string>
<string
name=
"share_log_description"
>
Share yuzu\'s log file to debug issues
</string>
<string
name=
"share_log_description"
>
Share yuzu\'s log file to debug issues
</string>
<string
name=
"share_log_missing"
>
No log file found
</string>
<string
name=
"share_log_missing"
>
No log file found
</string>
...
@@ -140,6 +140,7 @@
...
@@ -140,6 +140,7 @@
<string
name=
"user_data_export_success"
>
User data exported successfully
</string>
<string
name=
"user_data_export_success"
>
User data exported successfully
</string>
<string
name=
"user_data_import_success"
>
User data imported successfully
</string>
<string
name=
"user_data_import_success"
>
User data imported successfully
</string>
<string
name=
"user_data_export_cancelled"
>
Export cancelled
</string>
<string
name=
"user_data_export_cancelled"
>
Export cancelled
</string>
<string
name=
"user_data_import_failed_description"
>
Make sure the user data folders are at the root of the zip folder and contain a config file at config/config.ini and try again.
</string>
<string
name=
"support_link"
>
https://discord.gg/u77vRWY
</string>
<string
name=
"support_link"
>
https://discord.gg/u77vRWY
</string>
<string
name=
"website_link"
>
https://yuzu-emu.org/
</string>
<string
name=
"website_link"
>
https://yuzu-emu.org/
</string>
<string
name=
"github_link"
>
https://github.com/yuzu-emu
</string>
<string
name=
"github_link"
>
https://github.com/yuzu-emu
</string>
...
@@ -230,6 +231,7 @@
...
@@ -230,6 +231,7 @@
<string
name=
"string_import"
>
Import
</string>
<string
name=
"string_import"
>
Import
</string>
<string
name=
"export"
>
Export
</string>
<string
name=
"export"
>
Export
</string>
<string
name=
"export_failed"
>
Export failed
</string>
<string
name=
"export_failed"
>
Export failed
</string>
<string
name=
"import_failed"
>
Import failed
</string>
<string
name=
"cancelling"
>
Cancelling
</string>
<string
name=
"cancelling"
>
Cancelling
</string>
<!-- GPU driver installation -->
<!-- GPU driver installation -->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment