X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ed74bba5fbb7669a5254290b53db9f12e9c584af..30b332745d047412cf6e2399cf08092ab7728e5e:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index 8836ddce..e4168ba5 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -25,7 +25,6 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; -import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.Dialog; @@ -71,6 +70,7 @@ import com.actionbarsherlock.view.Window; import com.owncloud.android.BuildConfig; import com.owncloud.android.MainApp; import com.owncloud.android.R; +import com.owncloud.android.authentication.PinCheck; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.services.FileDownloader; import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder; @@ -160,6 +160,8 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { private String DIALOG_UNTRUSTED_CERT; private OCFile mWaitingToSend; + + private Boolean mUnlocked = false; @Override protected void onCreate(Bundle savedInstanceState) { @@ -168,9 +170,14 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid - checkIfRequestPin(savedInstanceState); + + if (PinCheck.checkIfPinEntry()){ + Intent i = new Intent(MainApp.getAppContext(), PinCodeActivity.class); + i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity"); + startActivity(i); + } - /// grant that FileObserverService is watching favourite files + /// grant that FileObserverService is watching favorite files if (savedInstanceState == null) { Intent initObserversIntent = FileObserverService.makeInitIntent(this); startService(initObserversIntent); @@ -209,15 +216,6 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { Log_OC.d(TAG, "onCreate() end"); } - private void checkIfRequestPin(Bundle savedInstanceState){ - // PIN CODE request ; best location is to decide, let's try this first - if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) { - requestPinCode(); - } else if (getIntent().getAction() == null && savedInstanceState == null) { - requestPinCode(); - } - } - @Override protected void onStart() { super.onStart(); @@ -616,14 +614,6 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { @TargetApi(Build.VERSION_CODES.JELLY_BEAN) protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - - Log_OC.d(TAG, "requestCode: " + requestCode); - if (requestCode == PinCodeActivity.EXTRA_PIN_CORRECT){ - Log_OC.d(TAG, "Extra pin: " + resultCode); - if (resultCode == RESULT_OK) { - resume(); - } - } 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 @@ -814,10 +804,12 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { super.onResume(); Log_OC.e(TAG, "onResume() start"); - checkIfRequestPin(null); - } + if (PinCheck.checkIfPinEntry()){ + Intent i = new Intent(MainApp.getAppContext(), PinCodeActivity.class); + i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity"); + startActivity(i); + } - private void resume(){ // refresh list of files refreshListOfFilesFragment(); @@ -863,7 +855,7 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { mDownloadFinishReceiver = null; } - + PinCheck.setUnlockTimestamp(); Log_OC.d(TAG, "onPause() end"); super.onPause(); } @@ -1455,23 +1447,6 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { } }; - - - /** - * Launch an intent to request the PIN code to the user before letting him use the app - */ - private void requestPinCode() { - boolean pinStart = false; - SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - pinStart = appPrefs.getBoolean("set_pincode", false); - if (pinStart) { - Intent i = new Intent(getApplicationContext(), PinCodeActivity.class); - // i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "FileDisplayActivity"); - startActivityForResult(i, PinCodeActivity.EXTRA_PIN_CORRECT); - } - } - - @Override public void onSavedCertificate() { startSyncFolderOperation(getCurrentDir(), false);