Skip to content

Commit 8601ac4

Browse files
aforcieraforcier
authored
Merge pull request #21 from wordpress-mobile/merge-wpa-develop
Sync changes from WPAndroid
2 parents 1882f52 + 1eb9230 commit 8601ac4

31 files changed

+147
-116
lines changed

‎libs/login/build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.2.1'
7+
classpath 'com.android.tools.build:gradle:3.3.2'
88
}
99
}
1010

@@ -35,12 +35,12 @@ dependencies {
3535
exclude group: "com.mcxiaoke.volley"
3636
}
3737

38-
implementation 'com.android.support:appcompat-v7:28.0.0'
39-
implementation 'com.android.support:animated-vector-drawable:28.0.0'
40-
implementation 'com.android.support:support-media-compat:28.0.0'
41-
implementation 'com.android.support:support-v13:28.0.0'
42-
implementation 'com.android.support:gridlayout-v7:28.0.0'
43-
implementation 'com.android.support:design:28.0.0'
38+
implementation 'androidx.appcompat:appcompat:1.0.2'
39+
implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
40+
implementation 'androidx.media:media:1.0.1'
41+
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
42+
implementation 'androidx.gridlayout:gridlayout:1.0.0'
43+
implementation 'com.google.android.material:material:1.0.0'
4444

4545
api 'com.google.android.gms:play-services-auth:15.0.1'
4646

@@ -51,7 +51,7 @@ dependencies {
5151
exclude group: "org.wordpress", module: "utils"
5252
}
5353
} else {
54-
implementation("com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:8cdbf03cf3d595ef904bab3c1dc207e39242c882") {
54+
implementation("com.github.wordpress-mobile.WordPress-FluxC-Android:fluxc:9f07b031646dd3e6021d4b8e0a35647c9109ff27") {
5555
exclude group: "com.android.support"
5656
exclude group: "org.wordpress", module: "utils"
5757
}
@@ -61,11 +61,11 @@ dependencies {
6161
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
6262

6363
// Dagger
64-
implementation 'com.google.dagger:dagger:2.11'
65-
annotationProcessor 'com.google.dagger:dagger-compiler:2.11'
64+
implementation 'com.google.dagger:dagger:2.22.1'
65+
annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
6666
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
67-
implementation 'com.google.dagger:dagger-android-support:2.11'
68-
annotationProcessor 'com.google.dagger:dagger-android-processor:2.11'
67+
implementation 'com.google.dagger:dagger-android-support:2.22.1'
68+
annotationProcessor 'com.google.dagger:dagger-android-processor:2.22.1'
6969

7070
lintChecks 'org.wordpress:lint:1.0.1'
7171
}

‎libs/login/src/main/java/org/wordpress/android/login/GoogleFragment.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import android.content.Intent;
55
import android.content.IntentSender;
66
import android.os.Bundle;
7-
import android.support.annotation.NonNull;
8-
import android.support.v4.app.Fragment;
97
import android.util.Log;
108

9+
import androidx.annotation.NonNull;
10+
import androidx.fragment.app.Fragment;
11+
1112
import com.google.android.gms.auth.api.Auth;
1213
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
1314
import com.google.android.gms.common.ConnectionResult;

‎libs/login/src/main/java/org/wordpress/android/login/Login2FaFragment.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
import android.content.ClipboardManager;
44
import android.content.Context;
55
import android.os.Bundle;
6-
import android.support.annotation.LayoutRes;
7-
import android.support.annotation.NonNull;
8-
import android.support.annotation.Nullable;
9-
import android.support.annotation.StringRes;
10-
import android.support.v7.app.AlertDialog;
116
import android.text.Editable;
127
import android.text.TextUtils;
138
import android.text.TextWatcher;
@@ -20,6 +15,12 @@
2015
import android.widget.EditText;
2116
import android.widget.TextView;
2217

18+
import androidx.annotation.LayoutRes;
19+
import androidx.annotation.NonNull;
20+
import androidx.annotation.Nullable;
21+
import androidx.annotation.StringRes;
22+
import androidx.appcompat.app.AlertDialog;
23+
2324
import org.greenrobot.eventbus.Subscribe;
2425
import org.greenrobot.eventbus.ThreadMode;
2526
import org.wordpress.android.fluxc.generated.AccountActionBuilder;

‎libs/login/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
import android.content.DialogInterface;
66
import android.net.Uri;
77
import android.os.Bundle;
8-
import android.support.annotation.CallSuper;
9-
import android.support.annotation.LayoutRes;
10-
import android.support.annotation.NonNull;
11-
import android.support.annotation.Nullable;
12-
import android.support.annotation.StringRes;
13-
import android.support.v4.app.Fragment;
14-
import android.support.v7.app.ActionBar;
15-
import android.support.v7.app.AppCompatActivity;
16-
import android.support.v7.widget.Toolbar;
178
import android.text.TextWatcher;
189
import android.view.LayoutInflater;
1910
import android.view.Menu;
@@ -26,20 +17,32 @@
2617
import android.widget.EditText;
2718
import android.widget.TextView;
2819

20+
import androidx.annotation.CallSuper;
21+
import androidx.annotation.LayoutRes;
22+
import androidx.annotation.NonNull;
23+
import androidx.annotation.Nullable;
24+
import androidx.annotation.StringRes;
25+
import androidx.appcompat.app.ActionBar;
26+
import androidx.appcompat.app.AppCompatActivity;
27+
import androidx.appcompat.widget.Toolbar;
28+
import androidx.fragment.app.Fragment;
29+
2930
import org.greenrobot.eventbus.Subscribe;
3031
import org.greenrobot.eventbus.ThreadMode;
3132
import org.wordpress.android.fluxc.Dispatcher;
3233
import org.wordpress.android.fluxc.action.AccountAction;
3334
import org.wordpress.android.fluxc.generated.AccountActionBuilder;
3435
import org.wordpress.android.fluxc.generated.SiteActionBuilder;
3536
import org.wordpress.android.fluxc.store.AccountStore;
37+
import org.wordpress.android.fluxc.store.AccountStore.AccountErrorType;
3638
import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged;
3739
import org.wordpress.android.fluxc.store.SiteStore;
3840
import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
3941
import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType;
4042
import org.wordpress.android.util.AppLog;
4143
import org.wordpress.android.util.EditTextUtils;
4244
import org.wordpress.android.util.ToastUtils;
45+
import org.wordpress.android.util.ToastUtils.Duration;
4346

4447
import javax.inject.Inject;
4548

@@ -290,9 +293,15 @@ public void onAccountChanged(OnAccountChanged event) {
290293

291294
if (event.isError()) {
292295
AppLog.e(AppLog.T.API, "onAccountChanged has error: " + event.error.type + " - " + event.error.message);
293-
ToastUtils.showToast(getContext(), R.string.error_fetch_my_profile);
294-
onLoginFinished(false);
295-
return;
296+
if (event.error.type == AccountErrorType.SETTINGS_FETCH_REAUTHORIZATION_REQUIRED_ERROR) {
297+
// This probably means we're logging in to 2FA-enabled account with a non-production WP.com client id.
298+
// A few WordPress.com APIs like /me/settings/ won't work for this account.
299+
ToastUtils.showToast(getContext(), R.string.error_disabled_apis, Duration.LONG);
300+
} else {
301+
ToastUtils.showToast(getContext(), R.string.error_fetch_my_profile, Duration.LONG);
302+
onLoginFinished(false);
303+
return;
304+
}
296305
}
297306

298307
if (event.causeOfChange == AccountAction.FETCH_ACCOUNT) {

‎libs/login/src/main/java/org/wordpress/android/login/LoginEmailFragment.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
import android.content.Intent;
66
import android.content.IntentSender;
77
import android.os.Bundle;
8-
import android.support.annotation.LayoutRes;
9-
import android.support.annotation.NonNull;
10-
import android.support.annotation.Nullable;
11-
import android.support.v7.app.AlertDialog;
128
import android.text.Editable;
139
import android.text.Html;
1410
import android.text.TextWatcher;
@@ -22,6 +18,11 @@
2218
import android.widget.LinearLayout;
2319
import android.widget.TextView;
2420

21+
import androidx.annotation.LayoutRes;
22+
import androidx.annotation.NonNull;
23+
import androidx.annotation.Nullable;
24+
import androidx.appcompat.app.AlertDialog;
25+
2526
import com.google.android.gms.auth.api.Auth;
2627
import com.google.android.gms.auth.api.credentials.Credential;
2728
import com.google.android.gms.auth.api.credentials.CredentialPickerConfig;

‎libs/login/src/main/java/org/wordpress/android/login/LoginEmailPasswordFragment.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.annotation.LayoutRes;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.Nullable;
85
import android.text.Editable;
96
import android.text.TextUtils;
107
import android.text.TextWatcher;
@@ -15,10 +12,14 @@
1512
import android.widget.EditText;
1613
import android.widget.TextView;
1714

15+
import androidx.annotation.LayoutRes;
16+
import androidx.annotation.NonNull;
17+
import androidx.annotation.Nullable;
18+
1819
import org.greenrobot.eventbus.Subscribe;
1920
import org.greenrobot.eventbus.ThreadMode;
20-
import org.wordpress.android.login.LoginWpcomService.OnCredentialsOK;
2121
import org.wordpress.android.login.LoginWpcomService.LoginState;
22+
import org.wordpress.android.login.LoginWpcomService.OnCredentialsOK;
2223
import org.wordpress.android.login.util.SiteUtils;
2324
import org.wordpress.android.login.widgets.WPLoginInputRow;
2425
import org.wordpress.android.login.widgets.WPLoginInputRow.OnEditorCommitListener;

‎libs/login/src/main/java/org/wordpress/android/login/LoginHttpAuthDialogFragment.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
import android.content.DialogInterface;
66
import android.content.Intent;
77
import android.os.Bundle;
8-
import android.support.annotation.NonNull;
9-
import android.support.annotation.Nullable;
10-
import android.support.v4.app.DialogFragment;
11-
import android.support.v7.app.AlertDialog;
128
import android.text.Editable;
139
import android.text.TextWatcher;
1410
import android.view.ContextThemeWrapper;
@@ -17,6 +13,11 @@
1713
import android.widget.EditText;
1814
import android.widget.TextView;
1915

16+
import androidx.annotation.NonNull;
17+
import androidx.annotation.Nullable;
18+
import androidx.appcompat.app.AlertDialog;
19+
import androidx.fragment.app.DialogFragment;
20+
2021
import org.wordpress.android.util.EditTextUtils;
2122

2223
public class LoginHttpAuthDialogFragment extends DialogFragment {

‎libs/login/src/main/java/org/wordpress/android/login/LoginListener.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.wordpress.android.login;
22

33
import android.net.Uri;
4-
import android.support.annotation.NonNull;
5-
import android.support.annotation.Nullable;
4+
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.Nullable;
67

78
import org.wordpress.android.fluxc.network.MemorizingTrustManager;
89
import org.wordpress.android.fluxc.store.SiteStore;

‎libs/login/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
import android.content.DialogInterface;
66
import android.graphics.drawable.Drawable;
77
import android.os.Bundle;
8-
import android.support.annotation.Nullable;
9-
import android.support.v4.app.Fragment;
10-
import android.support.v7.app.ActionBar;
11-
import android.support.v7.app.AppCompatActivity;
12-
import android.support.v7.widget.Toolbar;
138
import android.view.LayoutInflater;
149
import android.view.Menu;
1510
import android.view.MenuInflater;
@@ -19,6 +14,12 @@
1914
import android.widget.Button;
2015
import android.widget.ImageView;
2116

17+
import androidx.annotation.Nullable;
18+
import androidx.appcompat.app.ActionBar;
19+
import androidx.appcompat.app.AppCompatActivity;
20+
import androidx.appcompat.widget.Toolbar;
21+
import androidx.fragment.app.Fragment;
22+
2223
import com.bumptech.glide.Glide;
2324
import com.bumptech.glide.load.DataSource;
2425
import com.bumptech.glide.load.engine.GlideException;

‎libs/login/src/main/java/org/wordpress/android/login/LoginMagicLinkSentFragment.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.v4.app.Fragment;
7-
import android.support.v7.app.ActionBar;
8-
import android.support.v7.app.AppCompatActivity;
9-
import android.support.v7.widget.Toolbar;
105
import android.view.LayoutInflater;
116
import android.view.Menu;
127
import android.view.MenuInflater;
138
import android.view.MenuItem;
149
import android.view.View;
1510
import android.view.ViewGroup;
1611

12+
import androidx.annotation.Nullable;
13+
import androidx.appcompat.app.ActionBar;
14+
import androidx.appcompat.app.AppCompatActivity;
15+
import androidx.appcompat.widget.Toolbar;
16+
import androidx.fragment.app.Fragment;
17+
1718
import javax.inject.Inject;
1819

1920
import dagger.android.support.AndroidSupportInjection;

0 commit comments

Comments
 (0)