From 693ce5877a604a342fca46b2d500ed35d965a25b Mon Sep 17 00:00:00 2001 From: "Chris \"Koying\" Browet" Date: Sun, 21 Jun 2015 11:01:17 +0200 Subject: FIX: [droid] harden MigrateUserData --- .../android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in index c042703d40..81741ebee5 100644 --- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in +++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in @@ -417,8 +417,17 @@ public class Splash extends Activity { } private void MigrateUserData() { - String sOldUserDir = getExternalFilesDir(null).getParentFile().getParentFile() + "/org.xbmc.xbmc/files/.xbmc"; - File fOldUserDir = new File(sOldUserDir); + String sOldUserDir; + File fOldUserDir; + try { + sOldUserDir = getExternalFilesDir(null).getParentFile().getParentFile() + "/org.xbmc.xbmc/files/.xbmc"; + fOldUserDir = new File(sOldUserDir); + if (!fOldUserDir.exists()) + return; + } catch (Exception e) { + return; + } + File fNewUserDir = new File(getExternalFilesDir(null), ".@APP_NAME_LC@"); String sKodiMigrated = fNewUserDir.getAbsolutePath() + "/.kodi_data_was_migrated"; File fKodiMigrated = new File(sKodiMigrated); -- cgit v1.2.3