mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-11 17:06:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

cleanup code, use own preference manager

Browse source
This commit is contained in:
AndyScherzinger 2018-08-15 16:27:48 +02:00
parent 4c117baa2b
commit c6b25745b7
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -1192,7 +1192,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
* *
* @param hasFocus 'True' if focus is received, 'false' if is lost * @param hasFocus 'True' if focus is received, 'false' if is lost
*/ */
private void onPasswordFocusChanged(boolean hasFocus) { private void onPasswordFocusChanged(boolean hasFocus) {
if (hasFocus) { if (hasFocus) {
showViewPasswordButton(); showViewPasswordButton();
@ -1202,7 +1201,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
} }
} }
private void showViewPasswordButton() { private void showViewPasswordButton() {
int drawable = R.drawable.ic_view; int drawable = R.drawable.ic_view;
if (isPasswordVisible()) { if (isPasswordVisible()) {

13
src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java
View file

@ -26,12 +26,10 @@ import android.accounts.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -43,6 +41,7 @@ import com.owncloud.android.MainApp;
import com.owncloud.android.R; import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.db.PreferenceManager;
import com.owncloud.android.features.FeatureItem; import com.owncloud.android.features.FeatureItem;
import com.owncloud.android.ui.adapter.FeaturesViewAdapter; import com.owncloud.android.ui.adapter.FeaturesViewAdapter;
import com.owncloud.android.ui.whatsnew.ProgressIndicator; import com.owncloud.android.ui.whatsnew.ProgressIndicator;
@ -53,7 +52,6 @@ import com.owncloud.android.utils.DisplayUtils;
*/ */
public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageChangeListener { public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageChangeListener {
public static final String KEY_LAST_SEEN_VERSION_CODE = "lastSeenVersionCode";
public static final String EXTRA_ALLOW_CLOSE = "ALLOW_CLOSE"; public static final String EXTRA_ALLOW_CLOSE = "ALLOW_CLOSE";
public static final int FIRST_RUN_RESULT_CODE = 199; public static final int FIRST_RUN_RESULT_CODE = 199;
@ -162,17 +160,14 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
} }
private void onFinish() { private void onFinish() {
SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this); PreferenceManager.setLastSeenVersionCode(this, MainApp.getVersionCode());
SharedPreferences.Editor editor = pref.edit();
editor.putInt(KEY_LAST_SEEN_VERSION_CODE, MainApp.getVersionCode());
editor.apply();
} }
static private boolean isFirstRun(Context context) { private static boolean isFirstRun(Context context) {
return AccountUtils.getCurrentOwnCloudAccount(context) == null; return AccountUtils.getCurrentOwnCloudAccount(context) == null;
} }
static public boolean runIfNeeded(Context context) { public static boolean runIfNeeded(Context context) {
if (context instanceof FirstRunActivity) { if (context instanceof FirstRunActivity) {
return false; return false;
} }

4
src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
View file

@ -138,7 +138,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
PreferenceManager.setLastSeenVersionCode(this, MainApp.getVersionCode()); PreferenceManager.setLastSeenVersionCode(this, MainApp.getVersionCode());
} }
static public void runIfNeeded(Context context) { public static void runIfNeeded(Context context) {
if (!context.getResources().getBoolean(R.bool.show_whats_new) if (!context.getResources().getBoolean(R.bool.show_whats_new)
|| context instanceof WhatsNewActivity) { || context instanceof WhatsNewActivity) {
return; return;
@ -149,7 +149,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
} }
} }
static private boolean shouldShow(Context context) { private static boolean shouldShow(Context context) {
return !(context instanceof PassCodeActivity) && getWhatsNew(context).length > 0; return !(context instanceof PassCodeActivity) && getWhatsNew(context).length > 0;
} }