X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/68b9744a9c99f38d35a7b146cde4f4deceee68b7..ff82b51e49f40155e7c340090f5ee759af2bf3ad:/src/com/owncloud/android/MainApp.java diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java index 760a5e79..c805f9f7 100644 --- a/src/com/owncloud/android/MainApp.java +++ b/src/com/owncloud/android/MainApp.java @@ -20,16 +20,21 @@ */ package com.owncloud.android; +import android.app.Activity; import android.app.Application; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.os.Build; +import android.os.Bundle; +import com.owncloud.android.authentication.PassCodeManager; import com.owncloud.android.datamodel.ThumbnailsCacheManager; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy; import com.owncloud.android.lib.common.utils.Log_OC; + /** * Main Application of the project * @@ -41,13 +46,18 @@ public class MainApp extends Application { private static final String TAG = MainApp.class.getSimpleName(); private static final String AUTH_ON = "on"; - + @SuppressWarnings("unused") private static final String POLICY_SINGLE_SESSION_PER_ACCOUNT = "single session per account"; @SuppressWarnings("unused") private static final String POLICY_ALWAYS_NEW_CLIENT = "always new client"; private static Context mContext; + + // TODO Enable when "On Device" is recovered? + // TODO better place + // private static boolean mOnlyOnDevice = false; + public void onCreate(){ super.onCreate(); @@ -75,6 +85,50 @@ public class MainApp extends Application { Log_OC.startLogging(); Log_OC.d("Debug", "start logging"); } + + // register global protection with pass code + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + this.registerActivityLifecycleCallbacks( new ActivityLifecycleCallbacks() { + + @Override + public void onActivityCreated(Activity activity, Bundle savedInstanceState) { + Log_OC.d(activity.getClass().getSimpleName(), "onCreate(Bundle) starting" ); + PassCodeManager.getPassCodeManager().onActivityCreated(activity); + } + + @Override + public void onActivityStarted(Activity activity) { + Log_OC.d(activity.getClass().getSimpleName(), "onStart() starting" ); + PassCodeManager.getPassCodeManager().onActivityStarted(activity); + } + + @Override + public void onActivityResumed(Activity activity) { + Log_OC.d(activity.getClass().getSimpleName(), "onResume() starting" ); + } + + @Override + public void onActivityPaused(Activity activity) { + Log_OC.d(activity.getClass().getSimpleName(), "onPause() ending"); + } + + @Override + public void onActivityStopped(Activity activity) { + Log_OC.d(activity.getClass().getSimpleName(), "onStop() ending" ); + PassCodeManager.getPassCodeManager().onActivityStopped(activity); + } + + @Override + public void onActivitySaveInstanceState(Activity activity, Bundle outState) { + Log_OC.d(activity.getClass().getSimpleName(), "onSaveInstanceState(Bundle) starting" ); + } + + @Override + public void onActivityDestroyed(Activity activity) { + Log_OC.d(activity.getClass().getSimpleName(), "onDestroy() ending" ); + } + }); + } } public static Context getAppContext() { @@ -122,6 +176,15 @@ public class MainApp extends Application { return getAppContext().getResources().getString(R.string.log_name); } + // TODO Enable when "On Device" is recovered ? +// public static void showOnlyFilesOnDevice(boolean state){ +// mOnlyOnDevice = state; +// } +// +// public static boolean getOnlyOnDevice(){ +// return mOnlyOnDevice; +// } + // user agent public static String getUserAgent() { String appString = getAppContext().getResources().getString(R.string.user_agent);