OC-2332: rewrite getAvailableRemotePath from UpdateFileOperation, using ExistenceCehe...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / PinCodeActivity.java

diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index 4cc224a..c962fb2 100644 (file)
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -2,9 +2,8 @@
  *   Copyright (C) 2011 Bartek Przybylski
  *
  *   This program is free software: you can redistribute it and/or modify
  *   Copyright (C) 2011 Bartek Przybylski
  *
  *   This program is free software: you can redistribute it and/or modify

- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.

  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -20,32 +19,25 @@ package com.owncloud.android.ui.activity;
 import java.util.Arrays;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import java.util.Arrays;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;

-

 import com.owncloud.android.R;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import com.owncloud.android.R;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;

-import android.graphics.Typeface;

 import android.os.Bundle;
 import android.os.Bundle;

-import android.os.Handler;

 import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.preference.PreferenceManager;
 import android.text.Editable;

-import android.text.InputType;

 import android.text.TextWatcher;
 import android.text.TextWatcher;

-import android.text.method.PasswordTransformationMethod;

 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;

-import android.view.ViewGroup;

 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 

-

 public class PinCodeActivity extends SherlockFragmentActivity {
 
   
 public class PinCodeActivity extends SherlockFragmentActivity {
 
   


@@ -54,6 +46,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
     Button bCancel;
     TextView mPinHdr;
     
     Button bCancel;
     TextView mPinHdr;

+    TextView mPinHdrExplanation;

     EditText mText1;
     EditText mText2;
     EditText mText3;
     EditText mText1;
     EditText mText2;
     EditText mText3;


@@ -79,6 +72,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
      
         bCancel = (Button) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
      
         bCancel = (Button) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);

+        mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);

         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
         getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         mText1 = (EditText) findViewById(R.id.txt1);
         mText1.requestFocus();
         getWindow().setSoftInputMode(android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);


@@ -86,8 +80,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);
         
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);
         

-        
-        

         SharedPreferences appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
         
         SharedPreferences appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
         


@@ -106,6 +98,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                if (activity.equals("preferences")){
                 // PIN has been activated yet
                  mPinHdr.setText(R.string.pincode_configure_your_pin);
                if (activity.equals("preferences")){
                 // PIN has been activated yet
                  mPinHdr.setText(R.string.pincode_configure_your_pin);

+                 mPinHdrExplanation.setVisibility(View.VISIBLE);

                  pinCodeChecked = true ; // No need to check it 
                  setChangePincodeView(true);
                }else{
                  pinCodeChecked = true ; // No need to check it 
                  setChangePincodeView(true);
                }else{


@@ -113,12 +106,14 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                  bCancel.setVisibility(View.INVISIBLE);
                  bCancel.setVisibility(View.GONE);
                  mPinHdr.setText(R.string.pincode_enter_pin_code);
                  bCancel.setVisibility(View.INVISIBLE);
                  bCancel.setVisibility(View.GONE);
                  mPinHdr.setText(R.string.pincode_enter_pin_code);

+                 mPinHdrExplanation.setVisibility(View.INVISIBLE);

                  setChangePincodeView(false);
               }
             
            }else {
             // pincode removal
               mPinHdr.setText(R.string.pincode_remove_your_pincode);
                  setChangePincodeView(false);
               }
             
            }else {
             // pincode removal
               mPinHdr.setText(R.string.pincode_remove_your_pincode);

+              mPinHdrExplanation.setVisibility(View.INVISIBLE);

               pinCodeChecked = false;
               setChangePincodeView(true); 
            }
               pinCodeChecked = false;
               setChangePincodeView(true); 
            }


@@ -142,6 +137,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         bCancel.setVisibility(View.INVISIBLE);
         bCancel.setVisibility(View.GONE);
         mPinHdr.setText(R.string.pincode_enter_pin_code);
         bCancel.setVisibility(View.INVISIBLE);
         bCancel.setVisibility(View.GONE);
         mPinHdr.setText(R.string.pincode_enter_pin_code);

+        mPinHdrExplanation.setVisibility(View.INVISIBLE);

     }
     
    
     }
     
    


@@ -238,8 +234,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {

-                // TODO Auto-generated method stub
-

                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
 
                     mText1.setText("");
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
 
                     mText1.setText("");


@@ -260,8 +254,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
                
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
                
             @Override
             public void onFocusChange(View v, boolean hasFocus) {

-                // TODO Auto-generated method stub
-                

                 mText2.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
                     mText2.setSelected(false);
                 mText2.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
                     mText2.setSelected(false);


@@ -305,8 +297,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {

-                // TODO Auto-generated method stub
-

                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText2.requestFocus();
                     if (!confirmingPinCode)
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText2.requestFocus();
                     if (!confirmingPinCode)


@@ -326,7 +316,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
             
             @Override
             public void onFocusChange(View v, boolean hasFocus) {

-                // TODO Auto-generated method stub

                 mText3.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
                     mText3.setSelected(false);
                 mText3.setCursorVisible(true);
                 if (mText1.getText().toString().equals("")){
                     mText3.setSelected(false);


@@ -411,8 +400,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
 
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {

-                // TODO Auto-generated method stub
-

                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText3.requestFocus();
                     if (!confirmingPinCode)
                 if (keyCode == KeyEvent.KEYCODE_DEL && bChange) {
                     mText3.requestFocus();
                     if (!confirmingPinCode)


@@ -431,8 +418,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
             
             @Override
             public void onFocusChange(View v, boolean hasFocus) {

-                // TODO Auto-generated method stub
-                

                 mText4.setCursorVisible(true);
                 
                 if (mText1.getText().toString().equals("")){
                 mText4.setCursorVisible(true);
                 
                 if (mText1.getText().toString().equals("")){


@@ -467,6 +452,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     
         clearBoxes(); 
         mPinHdr.setText(R.string.pincode_reenter_your_pincode); 
     
         clearBoxes(); 
         mPinHdr.setText(R.string.pincode_reenter_your_pincode); 

+        mPinHdrExplanation.setVisibility(View.INVISIBLE);        

         confirmingPinCode =true;
         
     }
         confirmingPinCode =true;
         
     }


@@ -503,7 +489,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {

-                    // TODO Auto-generated method stub("");

                    return; 
                 }
                 
                    return; 
                 }
                 


@@ -511,6 +496,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
             aDialog.show();
             clearBoxes(); 
             mPinHdr.setText(R.string.pincode_enter_pin_code);
             aDialog.show();
             clearBoxes(); 
             mPinHdr.setText(R.string.pincode_enter_pin_code);

+            mPinHdrExplanation.setVisibility(View.INVISIBLE);

             newPasswordEntered = true;
             confirmingPinCode = false;
             
             newPasswordEntered = true;
             confirmingPinCode = false;
             


@@ -549,13 +535,13 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
 
                 @Override
                 public void onClick(DialogInterface dialog, int which) {

-                    // TODO Auto-generated method stub("");

                    return; 
                 }
                 
             });
             aDialog.show();
             mPinHdr.setText(R.string.pincode_configure_your_pin);
                    return; 
                 }
                 
             });
             aDialog.show();
             mPinHdr.setText(R.string.pincode_configure_your_pin);

+            mPinHdrExplanation.setVisibility(View.VISIBLE);

             clearBoxes();
         }
     
             clearBoxes();
         }
     


@@ -583,7 +569,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
 
             @Override
             public void onClick(DialogInterface dialog, int which) {
 
             @Override
             public void onClick(DialogInterface dialog, int which) {

-                // TODO Auto-generated method stub("");

                 finish();
                 return; 
             }
                 finish();
                 return; 
             }