From: David A. Velasco Date: Tue, 9 Jul 2013 11:25:43 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay X-Git-Tag: oc-android-1.4.3~7^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fffa77e2115c03dfad403b0f9106736256b7c10b?hp=7a7fe5dbca73817d2e8d55cbd46ab99efa38bacf Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay --- diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index e5383ed4..0ce6ccee 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -137,10 +137,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa @Override protected void onCreate(Bundle savedInstanceState) { Log_OC.d(TAG, "onCreate() start"); - super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - + + super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid + mHandler = new Handler(); /// bindings to transference services diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index b9d386f1..c6744422 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -118,7 +118,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName super.onSaveInstanceState(outState); outState.putParcelable(EXTRA_FILE, mFile); } - + /** * Call this, when the user presses the up button