Merge remote-tracking branch 'origin/master' into moresync

diff --combined AndroidManifest.xml
index 5b7d1fe,1d386b9..1fb2075
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,7 -18,7 +18,7 @@@
   -->\r
  <manifest package="eu.alefzero.owncloud"\r
      android:versionCode="1"\r
 -    android:versionName="0.1.151B" xmlns:android="http://schemas.android.com/apk/res/android">\r
 +    android:versionName="0.1.152B" xmlns:android="http://schemas.android.com/apk/res/android">\r
  \r
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
@@@ -142,6 -142,7 +142,7 @@@
          </receiver>\r
  \r
          <activity android:name=".ui.activity.FileDetailActivity" />
+         <activity android:name=".ui.activity.PinCodeActivity" />\r
          <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
          <activity android:name=".extensions.ExtensionsListActivity"></activity>\r
          <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>\r

diff --combined src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index ae069b5,d5bdc59..3412af8
--- 1/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
--- 2/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@@ -33,11 -33,13 +33,13 @@@ import android.content.DialogInterface
  import android.content.DialogInterface.OnClickListener;\r
  import android.content.Intent;\r
  import android.content.IntentFilter;\r
+ import android.content.SharedPreferences;\r
  import android.content.pm.PackageInfo;\r
  import android.content.pm.PackageManager.NameNotFoundException;\r
  import android.database.Cursor;\r
  import android.net.Uri;\r
  import android.os.Bundle;\r
+ import android.preference.PreferenceManager;\r
  import android.provider.MediaStore;\r
  import android.support.v4.app.FragmentTransaction;\r
  import android.util.Log;\r
@@@ -129,6 -131,18 +131,18 @@@ public class FileDisplayActivity extend
              \r
              initDelayedTilAccountAvailabe();\r
              \r
+             // PIN CODE request\r
+             // best location is to decide; let's try this first\r
+             boolean pinStart = false;\r
+             SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());\r
+             pinStart = appPrefs.getBoolean("set_passcode", false);\r
+             \r
+             if (pinStart) {\r
+                 Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
+                 i.putExtra("activity", "splash");\r
+                 startActivity(i);\r
+             }\r
+             \r
          } else {\r
              \r
              setContentView(R.layout.no_account_available);\r
@@@ -619,14 -633,11 +633,14 @@@
              if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  \r
              \r
                  String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); \r
 -                        \r
 -                if (mCurrentDir == null)\r
 +                 \r
 +                boolean fillBlankRoot = false;\r
 +                if (mCurrentDir == null) {\r
                      mCurrentDir = mStorageManager.getFileByPath("/");\r
 +                    fillBlankRoot = (mCurrentDir != null);\r
 +                }\r
  \r
 -                if (synchFolderRemotePath != null && mCurrentDir != null && mCurrentDir.getRemotePath().equals(synchFolderRemotePath) ) {\r
 +                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {\r
                      FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
                              .findFragmentById(R.id.fileList);\r
                      mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r