Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList

[pub/Android/ownCloud.git] / src / com / owncloud / android / MainApp.java

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 789fa14..c805f9f 100644 (file)
--- 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.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 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.PinCheck;
+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.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
 
 /**
  * Main Application of the project


@@ -52,20 +47,17 @@ public class MainApp extends Application {
 
     private static final String AUTH_ON = "on";
 
 
     private static final String AUTH_ON = "on";
 

-    private static final Set<String> sExemptOfPasscodeActivites;
-
-    static {
-        sExemptOfPasscodeActivites = new HashSet<String>();
-        sExemptOfPasscodeActivites.add(AuthenticatorActivity.class.getCanonicalName());
-        sExemptOfPasscodeActivites.add(PinCodeActivity.class.getCanonicalName());
-    }
-    

     @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;
     @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();
     
     public void onCreate(){
         super.onCreate();


@@ -100,49 +92,40 @@ public class MainApp extends Application {
 
                 @Override
                 public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
 
                 @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) {
                 }
 
                 @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) {
                 }
 
                 @Override
                 public void onActivityResumed(Activity activity) {

-                    Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onResume()" );
-                    if (!sExemptOfPasscodeActivites.contains(activity.getClass().getCanonicalName()) &&
-                        PinCheck.checkIfPinEntry()
-                            ){
-                        Intent i = new Intent(MainApp.getAppContext(), PinCodeActivity.class);
-                        //i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, activity.getClass().getSimpleName());
-                        i.setAction(PinCodeActivity.ACTION_REQUEST);
-                        activity.startActivity(i);
-                    }
+                    Log_OC.d(activity.getClass().getSimpleName(), "onResume() starting" );

                 }
 
                 @Override
                 public void onActivityPaused(Activity activity) {
                 }
 
                 @Override
                 public void onActivityPaused(Activity activity) {

-                    Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onPause()");
-                    PinCheck.setUnlockTimestamp();
+                    Log_OC.d(activity.getClass().getSimpleName(), "onPause() ending");

                 }
 
                 @Override
                 public void onActivityStopped(Activity activity) {
                 }
 
                 @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) {
                 }
 
                 @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) {
                 }
 
                 @Override
                 public void onActivityDestroyed(Activity activity) {

-                    Log_OC.d(TAG, activity.getClass().getSimpleName() + " in onDestroy()" );
-
+                    Log_OC.d(activity.getClass().getSimpleName(), "onDestroy() ending" );

                 }
             });
         }
                 }
             });
         }


@@ -193,6 +176,15 @@ public class MainApp extends Application {
         return getAppContext().getResources().getString(R.string.log_name);
     }
 
         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);
     // user agent
     public static String getUserAgent() {
         String appString = getAppContext().getResources().getString(R.string.user_agent);