X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/84e99c3cc7bfd51fa648ecae35a839269204c2d0..ff82b51e49f40155e7c340090f5ee759af2bf3ad:/src/com/owncloud/android/MainApp.java diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java index b16198d8..c805f9f7 100644 --- a/src/com/owncloud/android/MainApp.java +++ b/src/com/owncloud/android/MainApp.java @@ -23,22 +23,17 @@ package com.owncloud.android; import android.app.Activity; import android.app.Application; import android.content.Context; -import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import com.owncloud.android.authentication.AuthenticatorActivity; 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; -import com.owncloud.android.ui.activity.PinCodeActivity; -import java.util.HashSet; -import java.util.Set; /** * Main Application of the project @@ -58,6 +53,11 @@ public class MainApp extends Application { 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(); @@ -92,41 +92,40 @@ public class MainApp extends Application { @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onCreate(Bundle)" ); + Log_OC.d(activity.getClass().getSimpleName(), "onCreate(Bundle) starting" ); + PassCodeManager.getPassCodeManager().onActivityCreated(activity); } @Override public void onActivityStarted(Activity activity) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onStart()" ); + Log_OC.d(activity.getClass().getSimpleName(), "onStart() starting" ); PassCodeManager.getPassCodeManager().onActivityStarted(activity); } @Override public void onActivityResumed(Activity activity) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onResume()" ); + Log_OC.d(activity.getClass().getSimpleName(), "onResume() starting" ); } @Override public void onActivityPaused(Activity activity) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onPause()"); + Log_OC.d(activity.getClass().getSimpleName(), "onPause() ending"); } @Override public void onActivityStopped(Activity activity) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onStop()" ); + Log_OC.d(activity.getClass().getSimpleName(), "onStop() ending" ); PassCodeManager.getPassCodeManager().onActivityStopped(activity); } @Override public void onActivitySaveInstanceState(Activity activity, Bundle outState) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onSaveInstanceState(Bundle)" ); - + Log_OC.d(activity.getClass().getSimpleName(), "onSaveInstanceState(Bundle) starting" ); } @Override public void onActivityDestroyed(Activity activity) { - Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onDestroy()" ); - + Log_OC.d(activity.getClass().getSimpleName(), "onDestroy() ending" ); } }); } @@ -177,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);