- removed whitespaces

- renamed pin description

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13e819e..23b37e2 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,8 +24,7 @@
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage Accounts</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_manage_accounts">Manage Accounts</string>

-    <string name="prefs_pincode">Protect your client</string>
-    <string name="prefs_pincode_summary">PIN will be asked for 10s after leaving the app.</string>
+    <string name="prefs_pincode">Passcode lock</string>

     <string name="prefs_instant_upload">Instant picture uploads</string>
     <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
     <string name="prefs_instant_video_upload">Instant video uploads</string>
     <string name="prefs_instant_upload">Instant picture uploads</string>
     <string name="prefs_instant_upload_summary">Instantly upload pictures taken by camera</string>
     <string name="prefs_instant_video_upload">Instant video uploads</string>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 1673e21..70c24fc 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -27,8 +27,7 @@
                android:title="@string/prefs_select_oc_account"
                android:summary="@string/prefs_summary_select_oc_account"
                / -->
                android:title="@string/prefs_select_oc_account"
                android:summary="@string/prefs_summary_select_oc_account"
                / -->

-           <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
-                        android:summary="@string/prefs_pincode_summary"/>
+           <android.preference.CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" />

        </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading">
        </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading">

diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 84abf1b..58a7a99 100644 (file)
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -46,7 +46,7 @@ public class MainApp extends Application {
     
     public void onCreate(){
         super.onCreate();
     
     public void onCreate(){
         super.onCreate();

-        MainApp.mContext = getApplicationContext();     
+        MainApp.mContext = getApplicationContext();

         
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
         
         
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
         

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index e1fc901..e4168ba 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -176,7 +176,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
             i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");
             startActivity(i);
         }
             i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity");
             startActivity(i);
         }

-        
+

         /// grant that FileObserverService is watching favorite files
         if (savedInstanceState == null) {
             Intent initObserversIntent = FileObserverService.makeInitIntent(this);
         /// grant that FileObserverService is watching favorite files
         if (savedInstanceState == null) {
             Intent initObserversIntent = FileObserverService.makeInitIntent(this);


@@ -614,7 +614,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener {
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

-        
+

         if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
             //getClipData is only supported on api level 16+, Jelly Bean
             if (data.getData() == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
         if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
             //getClipData is only supported on api level 16+, Jelly Bean
             if (data.getData() == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){

diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index f187c0e..0bb48a3 100644 (file)
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -553,14 +553,10 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         appPrefs.commit();
         
         pinCodeEnd(true);
         appPrefs.commit();
         
         pinCodeEnd(true);

-        
-        
-        

     }
     
     
     protected void clearBoxes(){
     }
     
     
     protected void clearBoxes(){

-        

         mText1.setText("");
         mText2.setText("");
         mText3.setText("");
         mText1.setText("");
         mText2.setText("");
         mText3.setText("");


@@ -572,7 +568,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event){
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event){
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount()== 0){

-            

             if (mActivity.equals("preferences")){
                 SharedPreferences.Editor appPrefsE = PreferenceManager
             
             if (mActivity.equals("preferences")){
                 SharedPreferences.Editor appPrefsE = PreferenceManager
             


@@ -588,14 +583,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                 finish();
             }
             return true; 
                 finish();
             }
             return true; 

-            

         }
         }

-        

         return super.onKeyDown(keyCode, event);
         return super.onKeyDown(keyCode, event);

-    }
-    
-   
-
-    
-            
+    }     

 }
 }

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 8dc59e9..b693767 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -340,7 +340,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener {
         filter.addAction(FileDownloader.getDownloadAddedMessage());
         registerReceiver(mDownloadFinishReceiver, filter);
     }
         filter.addAction(FileDownloader.getDownloadAddedMessage());
         registerReceiver(mDownloadFinishReceiver, filter);
     }

-  
+

     @Override
     protected void onPostResume() {
         //Log_OC.e(TAG, "ACTIVITY, ONPOSTRESUME");
     @Override
     protected void onPostResume() {
         //Log_OC.e(TAG, "ACTIVITY, ONPOSTRESUME");


@@ -541,7 +541,7 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener {
             }
         }
     }
             }
         }
     }

-   
+

     @Override
     public void onBrowsedDownTo(OCFile folder) {
         // TODO Auto-generated method stub
     @Override
     public void onBrowsedDownTo(OCFile folder) {
         // TODO Auto-generated method stub


@@ -587,5 +587,4 @@ ViewPager.OnPageChangeListener, OnRemoteOperationListener {
         }
         return false;
     }
         }
         return false;
     }

-

 }
 }