From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 9 Jul 2012 09:28:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into moresync
X-Git-Tag: oc-android-1.4.3~298
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cbf9ca8beac99dc06678d13c5f80804d56445472?ds=inline;hp=-c

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

cbf9ca8beac99dc06678d13c5f80804d56445472
diff --combined AndroidManifest.xml
index 5b7d1fe5,1d386b9f..1fb20757
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,7 -18,7 +18,7 @@@
   -->
  <manifest package="eu.alefzero.owncloud"
      android:versionCode="1"
 -    android:versionName="0.1.151B" xmlns:android="http://schemas.android.com/apk/res/android">
 +    android:versionName="0.1.152B" xmlns:android="http://schemas.android.com/apk/res/android">
  
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@@ -142,6 -142,7 +142,7 @@@
          </receiver>
  
          <activity android:name=".ui.activity.FileDetailActivity" />
+         <activity android:name=".ui.activity.PinCodeActivity" />
          <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
          <activity android:name=".extensions.ExtensionsListActivity"></activity>
          <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
diff --combined src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index ae069b5d,d5bdc59d..3412af81
--- a/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;
  import android.content.Intent;
  import android.content.IntentFilter;
+ import android.content.SharedPreferences;
  import android.content.pm.PackageInfo;
  import android.content.pm.PackageManager.NameNotFoundException;
  import android.database.Cursor;
  import android.net.Uri;
  import android.os.Bundle;
+ import android.preference.PreferenceManager;
  import android.provider.MediaStore;
  import android.support.v4.app.FragmentTransaction;
  import android.util.Log;
@@@ -129,6 -131,18 +131,18 @@@ public class FileDisplayActivity extend
              
              initDelayedTilAccountAvailabe();
              
+             // PIN CODE request
+             // best location is to decide; let's try this first
+             boolean pinStart = false;
+             SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+             pinStart = appPrefs.getBoolean("set_passcode", false);
+             
+             if (pinStart) {
+                 Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);
+                 i.putExtra("activity", "splash");
+                 startActivity(i);
+             }
+             
          } else {
              
              setContentView(R.layout.no_account_available);
@@@ -619,14 -633,11 +633,14 @@@
              if (account_name.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  
              
                  String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
 -                        
 -                if (mCurrentDir == null)
 +                 
 +                boolean fillBlankRoot = false;
 +                if (mCurrentDir == null) {
                      mCurrentDir = mStorageManager.getFileByPath("/");
 +                    fillBlankRoot = (mCurrentDir != null);
 +                }
  
 -                if (synchFolderRemotePath != null && mCurrentDir != null && mCurrentDir.getRemotePath().equals(synchFolderRemotePath) ) {
 +                if (synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath) || fillBlankRoot) ) {
                      FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()
                              .findFragmentById(R.id.fileList);
                      mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);