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 0340340..c805f9f 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -20,15 +20,21 @@
  */
 package com.owncloud.android;
 
  */
 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.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;
 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
  * 
 /**
  * Main Application of the project
  * 


@@ -40,13 +46,18 @@ public class MainApp extends Application {
     private static final String TAG = MainApp.class.getSimpleName();
 
     private static final String AUTH_ON = "on";
     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;
     @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();


@@ -55,7 +66,11 @@ public class MainApp extends Application {
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
 
         OwnCloudClientManagerFactory.setUserAgent(getUserAgent());
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
 
         OwnCloudClientManagerFactory.setUserAgent(getUserAgent());

-        OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
+        if (isSamlAuth) {
+            OwnCloudClientManagerFactory.setDefaultPolicy(Policy.SINGLE_SESSION_PER_ACCOUNT);
+        } else {
+            OwnCloudClientManagerFactory.setDefaultPolicy(Policy.ALWAYS_NEW_CLIENT);
+        }

 
         // initialise thumbnails cache on background thread
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();
 
         // initialise thumbnails cache on background thread
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();


@@ -70,6 +85,50 @@ public class MainApp extends Application {
             Log_OC.startLogging();
             Log_OC.d("Debug", "start logging");
         }
             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() {
     }
 
     public static Context getAppContext() {


@@ -117,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);


@@ -127,14 +195,14 @@ public class MainApp extends Application {
         try {
             pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
             if (pInfo != null) {
         try {
             pInfo = getAppContext().getPackageManager().getPackageInfo(packageName, 0);
             if (pInfo != null) {

-                version = "/" + pInfo.versionName;
+                version = pInfo.versionName;

             }
         } catch (PackageManager.NameNotFoundException e) {
             Log_OC.e(TAG, "Trying to get packageName", e.getCause());
         }
 
             }
         } catch (PackageManager.NameNotFoundException e) {
             Log_OC.e(TAG, "Trying to get packageName", e.getCause());
         }
 

-       // Mozilla/5.0 (Android) ownCloud /1.7.0
-        String userAgent = appString + version;
+        // Mozilla/5.0 (Android) ownCloud-android/1.7.0
+        String userAgent = String.format(appString, version);

 
         return userAgent;
     }
 
         return userAgent;
     }