Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update

[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 486ca65..0d725e5 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -54,6 +54,10 @@ public class MainApp extends Application {
 
     private static Context mContext;
     
 
     private static Context mContext;
     

+    // TODO better place
+    private static boolean mOnlyOnDevice = false;
+
+    

     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();


@@ -88,6 +92,7 @@ public class MainApp extends Application {
                 @Override
                 public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
                     Log_OC.d(activity.getClass().getSimpleName(),  "onCreate(Bundle) starting" );
                 @Override
                 public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
                     Log_OC.d(activity.getClass().getSimpleName(),  "onCreate(Bundle) starting" );

+                    PassCodeManager.getPassCodeManager().onActivityCreated(activity);

                 }
 
                 @Override
                 }
 
                 @Override


@@ -169,6 +174,14 @@ public class MainApp extends Application {
     public static String getLogName() {
         return getAppContext().getResources().getString(R.string.log_name);
     }
     public static String getLogName() {
         return getAppContext().getResources().getString(R.string.log_name);
     }

+    
+    public static void showOnlyFilesOnDevice(boolean state){
+        mOnlyOnDevice = state;
+    }
+    
+    public static boolean getOnlyOnDevice(){
+        return mOnlyOnDevice;
+    }

 
     // user agent
     public static String getUserAgent() {
 
     // user agent
     public static String getUserAgent() {