Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 06:37:30 +00:00
Code Issues Releases Wiki Activity

Add ig error interceptor

Browse Source
This commit is contained in:
Ammar Githam 2021-03-22 22:02:48 +09:00
parent c57e305732
commit 91e13a23ad
6 changed files with 126 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/awais/instagrabber/InstaGrabberApplication.java
View File

@ -17,7 +17,6 @@ import awais.instagrabber.utils.Constants;
import awais.instagrabber.utils.LocaleUtils;
import awais.instagrabber.utils.SettingsHelper;
import awais.instagrabber.utils.TextUtils;
import awais.instagrabber.webservices.RetrofitFactory;
import awaisomereport.CrashReporter;
import static awais.instagrabber.utils.CookieUtils.NET_COOKIE_MANAGER;
@ -87,7 +86,5 @@ public final class InstaGrabberApplication extends Application {
if (TextUtils.isEmpty(settingsHelper.getString(Constants.DEVICE_UUID))) {
settingsHelper.putString(Constants.DEVICE_UUID, UUID.randomUUID().toString());
}
RetrofitFactory.setup(this);
}
}

2
app/src/main/java/awais/instagrabber/activities/MainActivity.java
View File

@ -83,6 +83,7 @@ import awais.instagrabber.utils.TextUtils;
import awais.instagrabber.utils.Utils;
import awais.instagrabber.utils.emoji.EmojiParser;
import awais.instagrabber.viewmodels.AppStateViewModel;
import awais.instagrabber.webservices.RetrofitFactory;
import static awais.instagrabber.utils.NavigationExtensions.setupWithNavController;
import static awais.instagrabber.utils.Utils.settingsHelper;
@ -138,6 +139,7 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
@Override
protected void onCreate(@Nullable final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
RetrofitFactory.setup(this);
binding = ActivityMainBinding.inflate(getLayoutInflater());
final String cookie = settingsHelper.getString(Constants.COOKIE);
CookieUtils.setupCookies(cookie);

1
app/src/main/java/awais/instagrabber/utils/Constants.java
View File

@ -111,6 +111,7 @@ public final class Constants {
public static final int SHOW_ACTIVITY_REQUEST_CODE = 1738;
public static final int SHOW_DM_THREAD = 2000;
public static final int DM_SYNC_SERVICE_REQUEST_CODE = 3000;
public static final int GLOBAL_NETWORK_ERROR_DIALOG_REQUEST_CODE = 7777;
public static final String ACTION_SHOW_ACTIVITY = "show_activity";
public static final String ACTION_SHOW_DM_THREAD = "show_dm_thread";

17
app/src/main/java/awais/instagrabber/webservices/RetrofitFactory.java
View File

@ -1,7 +1,5 @@
package awais.instagrabber.webservices;
import android.app.Application;
import androidx.annotation.NonNull;
import com.google.gson.FieldNamingPolicy;
@ -11,9 +9,11 @@ import com.google.gson.GsonBuilder;
import java.io.File;
import awais.instagrabber.BuildConfig;
import awais.instagrabber.activities.MainActivity;
import awais.instagrabber.repositories.responses.Caption;
import awais.instagrabber.utils.Utils;
import awais.instagrabber.webservices.interceptors.AddCookiesInterceptor;
import awais.instagrabber.webservices.interceptors.IgErrorsInterceptor;
import okhttp3.Cache;
import okhttp3.OkHttpClient;
import retrofit2.Retrofit;
@ -25,7 +25,7 @@ public final class RetrofitFactory {
private static RetrofitFactory instance;
private final Application application;
private final MainActivity mainActivity;
private final int cacheSize = 10 * 1024 * 1024; // 10 MB
private final Cache cache = new Cache(new File(Utils.cacheDir), cacheSize);
@ -33,11 +33,11 @@ public final class RetrofitFactory {
private Retrofit retrofit;
private Retrofit retrofitWeb;
public static void setup(@NonNull final Application application) {
public static void setup(@NonNull final MainActivity mainActivity) {
if (instance == null) {
synchronized (LOCK) {
if (instance == null) {
instance = new RetrofitFactory(application);
instance = new RetrofitFactory(mainActivity);
}
}
}
@ -50,20 +50,21 @@ public final class RetrofitFactory {
return instance;
}
private RetrofitFactory(@NonNull final Application application) {
this.application = application;
private RetrofitFactory(@NonNull final MainActivity mainActivity) {
this.mainActivity = mainActivity;
}
private Retrofit.Builder getRetrofitBuilder() {
if (builder == null) {
final OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
.addInterceptor(new AddCookiesInterceptor())
.followRedirects(false)
.followSslRedirects(false)
.cache(cache);
if (BuildConfig.DEBUG) {
// clientBuilder.addInterceptor(new LoggingInterceptor());
}
clientBuilder.addInterceptor(new AddCookiesInterceptor())
.addInterceptor(new IgErrorsInterceptor(mainActivity));
final Gson gson = new GsonBuilder()
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
.registerTypeAdapter(Caption.class, new Caption.CaptionDeserializer())

108
app/src/main/java/awais/instagrabber/webservices/interceptors/IgErrorsInterceptor.java Normal file
View File

@ -0,0 +1,108 @@
package awais.instagrabber.webservices.interceptors;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import org.json.JSONObject;
import java.io.IOException;
import awais.instagrabber.R;
import awais.instagrabber.activities.MainActivity;
import awais.instagrabber.dialogs.ConfirmDialogFragment;
import awais.instagrabber.utils.Constants;
import awais.instagrabber.utils.TextUtils;
import okhttp3.Interceptor;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
public class IgErrorsInterceptor implements Interceptor {
private static final String TAG = IgErrorsInterceptor.class.getSimpleName();
private final MainActivity mainActivity;
public IgErrorsInterceptor(@NonNull final MainActivity mainActivity) {
this.mainActivity = mainActivity;
}
@NonNull
@Override
public Response intercept(@NonNull final Chain chain) throws IOException {
final Request request = chain.request();
final Response response = chain.proceed(request);
if (response.isSuccessful()) {
return response;
}
checkError(response);
return response;
}
private void checkError(@NonNull final Response response) {
final int errorCode = response.code();
switch (errorCode) {
case 429: // "429 Too Many Requests"
// ('Throttled by Instagram because of too many API requests.');
showErrorDialog(R.string.throttle_error);
return;
case 431: // "431 Request Header Fields Too Large"
// show dialog?
Log.e(TAG, "Network error: " + getMessage(errorCode, "The request start-line and/or headers are too large to process."));
return;
}
final ResponseBody body = response.body();
if (body == null) return;
try {
final String bodyString = body.string();
final JSONObject jsonObject = new JSONObject(bodyString);
String message = jsonObject.optString("message", null);
if (!TextUtils.isEmpty(message)) {
message = message.toLowerCase();
switch (message) {
case "user_has_logged_out":
showErrorDialog(R.string.account_logged_out);
return;
case "login_required":
showErrorDialog(R.string.login_required);
return;
case "not authorized to view user": // Do we handle this in profile view fragment?
case "challenge_required": // Since we make users login using browser, we should not be getting this error in api requests
default:
Log.e(TAG, "checkError: " + bodyString);
return;
}
}
final String errorType = jsonObject.optString("error_type", null);
if (TextUtils.isEmpty(errorType)) return;
if (errorType.equals("sentry_block")) {
showErrorDialog(R.string.sentry_block);
return;
}
if (errorType.equals("inactive user")) {
showErrorDialog(R.string.inactive_user);
}
} catch (Exception e) {
Log.e(TAG, "checkError: ", e);
}
}
@NonNull
private String getMessage(final int errorCode, final String message) {
return String.format("code: %s, internalMessage: %s", errorCode, message);
}
private void showErrorDialog(@StringRes final int messageResId) {
if (messageResId == 0) return;
final ConfirmDialogFragment dialogFragment = ConfirmDialogFragment.newInstance(
Constants.GLOBAL_NETWORK_ERROR_DIALOG_REQUEST_CODE,
R.string.error,
messageResId,
R.string.ok,
0,
0
);
dialogFragment.show(mainActivity.getSupportFragmentManager(), "network_error_dialog");
}
}

6
app/src/main/res/values/strings.xml
View File

@ -473,4 +473,10 @@
<string name="removed_keywords">Removed keyword: %s from filter list</string>
<string name="marked_as_seen">Marked as seen</string>
<string name="delete_unsuccessful">Delete unsuccessful</string>
<string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
<string name="error">Error</string>
<string name="account_logged_out">This account has been logged out.</string>
<string name="login_required">Login required!</string>
<string name="sentry_block">Sentry block.</string>
<string name="inactive_user">User is inactive!</string>
</resources>