X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/66f3a45d050c27e41296ddc9083d968cfd8803a4..cdabcf7b34dfe47835fdf1bee5a538928d966dce:/src/com/owncloud/android/MainApp.java?ds=inline diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java index c805f9f7..1cac7e53 100644 --- a/src/com/owncloud/android/MainApp.java +++ b/src/com/owncloud/android/MainApp.java @@ -23,10 +23,13 @@ package com.owncloud.android; import android.app.Activity; import android.app.Application; import android.content.Context; +import android.content.SharedPreferences; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; +import android.os.Environment; +import android.preference.PreferenceManager; import com.owncloud.android.authentication.PassCodeManager; import com.owncloud.android.datamodel.ThumbnailsCacheManager; @@ -54,6 +57,8 @@ public class MainApp extends Application { private static Context mContext; + private static String storagePath; + // TODO Enable when "On Device" is recovered? // TODO better place // private static boolean mOnlyOnDevice = false; @@ -62,7 +67,12 @@ public class MainApp extends Application { public void onCreate(){ super.onCreate(); MainApp.mContext = getApplicationContext(); - + + SharedPreferences appPrefs = + PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + MainApp.storagePath = appPrefs.getString("storage_path", Environment. + getExternalStorageDirectory().getAbsolutePath()); + boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso)); OwnCloudClientManagerFactory.setUserAgent(getUserAgent()); @@ -82,7 +92,7 @@ public class MainApp extends Application { // Set folder for store logs Log_OC.setLogDataFolder(dataFolder); - Log_OC.startLogging(); + Log_OC.startLogging(MainApp.storagePath); Log_OC.d("Debug", "start logging"); } @@ -135,6 +145,14 @@ public class MainApp extends Application { return MainApp.mContext; } + public static String getStoragePath(){ + return MainApp.storagePath; + } + + public static void setStoragePath(String path){ + MainApp.storagePath = path; + } + // Methods to obtain Strings referring app_name // From AccountAuthenticator // public static final String ACCOUNT_TYPE = "owncloud";