Commit 42cbf58e authored by fallenstardust's avatar fallenstardust

已存在的ypk,yrp文件不做处理只给提示

parent e6dc8ca4
...@@ -134,10 +134,14 @@ public class GameUriManager { ...@@ -134,10 +134,14 @@ public class GameUriManager {
activity.startActivity(startdeck); activity.startActivity(startdeck);
} else if (file.getName().toLowerCase(Locale.US).endsWith(".ypk")) { } else if (file.getName().toLowerCase(Locale.US).endsWith(".ypk")) {
File ypk = new File(AppsSettings.get().getExpansionsPath() + "/" + file.getName().toLowerCase(Locale.US)); File ypk = new File(AppsSettings.get().getExpansionsPath() + "/" + file.getName().toLowerCase(Locale.US));
try { if (ypk.exists()) {
FileUtils.copyFile(file, ypk); Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_LONG).show();
} catch (Throwable e) { } else {
Toast.makeText(activity, activity.getString(R.string.install_failed_bcos) + e, Toast.LENGTH_LONG).show(); try {
FileUtils.copyFile(file, ypk);
} catch (Throwable e) {
Toast.makeText(activity, activity.getString(R.string.install_failed_bcos) + e, Toast.LENGTH_LONG).show();
}
} }
if (!AppsSettings.get().isReadExpansions()) { if (!AppsSettings.get().isReadExpansions()) {
activity.startActivity(startSeting); activity.startActivity(startSeting);
...@@ -148,8 +152,9 @@ public class GameUriManager { ...@@ -148,8 +152,9 @@ public class GameUriManager {
} }
} else if (file.getName().toLowerCase(Locale.US).endsWith(".yrp")) { } else if (file.getName().toLowerCase(Locale.US).endsWith(".yrp")) {
File yrp = new File(AppsSettings.get().getResourcePath() + "/" + CORE_REPLAY_PATH + "/" + file.getName().toLowerCase(Locale.US)); File yrp = new File(AppsSettings.get().getResourcePath() + "/" + CORE_REPLAY_PATH + "/" + file.getName().toLowerCase(Locale.US));
if (yrp.getAbsolutePath().equals(file)) { if (yrp.exists()) {
YGOStarter.startGame(getActivity(), null); YGOStarter.startGame(getActivity(), null);
Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_LONG).show();
} else { } else {
try { try {
FileUtils.copyFile(file, yrp); FileUtils.copyFile(file, yrp);
...@@ -190,15 +195,19 @@ public class GameUriManager { ...@@ -190,15 +195,19 @@ public class GameUriManager {
try { try {
File ypk = new File(AppsSettings.get().getExpansionsPath() + "/" + urifile.getName().toLowerCase(Locale.US)); File ypk = new File(AppsSettings.get().getExpansionsPath() + "/" + urifile.getName().toLowerCase(Locale.US));
ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r"); ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r");
if (pfd == null) { if (ypk.exists()) {
return; Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_SHORT).show();
} else { } else {
try { if (pfd == null) {
FileUtils.copyFile(new FileInputStream(pfd.getFileDescriptor()), ypk); return;
} catch (Throwable e) { } else {
Toast.makeText(activity, activity.getString(R.string.install_failed_bcos) + e, Toast.LENGTH_LONG).show(); try {
} finally { FileUtils.copyFile(new FileInputStream(pfd.getFileDescriptor()), ypk);
pfd.close(); } catch (Throwable e) {
Toast.makeText(activity, activity.getString(R.string.install_failed_bcos) + e, Toast.LENGTH_LONG).show();
} finally {
pfd.close();
}
} }
} }
} catch (Throwable e) { } catch (Throwable e) {
...@@ -217,6 +226,7 @@ public class GameUriManager { ...@@ -217,6 +226,7 @@ public class GameUriManager {
ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r"); ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r");
if (yrp.exists()) { if (yrp.exists()) {
YGOStarter.startGame(getActivity(), null); YGOStarter.startGame(getActivity(), null);
Toast.makeText(activity, activity.getString(R.string.file_exist), Toast.LENGTH_SHORT).show();
} else { } else {
if (pfd == null) { if (pfd == null) {
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment