Archives
/
FoxMagiskModuleManager
mirror of https://github.com/Fox2Code/FoxMagiskModuleManager
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add custom API key support

Browse Source 
Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/192/head
androidacy-user 2 years ago
parent cf9fe3d51f
commit fff580aeda
3 changed files with 88 additions and 20 deletions
Show Stats Download Patch File Download Diff File

40
app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java
Unescape Escape View File

@ -67,6 +67,28 @@ public final class AndroidacyRepoData extends RepoData {
return RepoManager.getINSTANCE().getAndroidacyRepoData();
}
public <string> boolean isValidToken(string token) {
try {
Http.doHttpGet("https://" + this.host + "/auth/me?token=" + token, false);
} catch (Exception e) {
if ("Received error code: 419".equals(e.getMessage()) ||
"Received error code: 429".equals(e.getMessage())) {
Log.e(TAG, "We are being rate limited!", e);
long time = System.currentTimeMillis();
this.androidacyBlockade = time + 3_600_000L;
return false;
}
Log.w(TAG, "Invalid token, resetting...");
// Remove saved preference
SharedPreferences.Editor editor = this.cachedPreferences.edit();
editor.remove("androidacy_api_token");
editor.apply();
return false;
}
// If status code is 200, we are good
return true;
}
@Override
protected boolean prepare() {
// Implementation details discussed on telegram
@ -77,21 +99,9 @@ public final class AndroidacyRepoData extends RepoData {
// Get token from androidacy_api_token shared preference
String token = this.cachedPreferences.getString("androidacy_api_token", null);
if (token != null) {
try {
Http.doHttpGet("https://" + this.host + "/auth/me?token=" + token, true);
} catch (Exception e) {
if ("Received error code: 419".equals(e.getMessage()) ||
"Received error code: 429".equals(e.getMessage())) {
Log.e(TAG, "We are being rate limited!", e);
this.androidacyBlockade = time + 3_600_000L;
return false;
}
Log.w(TAG, "Invalid token, resetting...");
// Remove saved preference
SharedPreferences.Editor editor = this.cachedPreferences.edit();
editor.remove("androidacy_api_token");
editor.apply();
this.token = token = null;
this.token = token;
if (!isValidToken(token)) {
token = null;
}
}
if (token == null) {

63
app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
Unescape Escape View File

@ -3,11 +3,14 @@ package com.fox2code.mmm.settings;
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.text.InputType;
import android.text.method.PasswordTransformationMethod;
import android.util.Log;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
@ -19,6 +22,7 @@ import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.EditTextPreference;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
@ -51,12 +55,16 @@ import com.mikepenz.aboutlibraries.LibsBuilder;
import com.topjohnwu.superuser.internal.UiThreadHandler;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.HashSet;
import java.util.Objects;
import java.util.Random;
import okhttp3.OkHttpClient;
import okhttp3.Request;
public class SettingsActivity extends FoxActivity implements LanguageActivity {
private static final int LANGUAGE_SUPPORT_LEVEL = 1;
private static final String TAG = "SettingsActivity";
@ -270,11 +278,56 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
"https://github.com/Fox2Code/FoxMagiskModuleManager");
return true;
});
// Add a listener to pref_androidacy_repo_api_key to update the api key in shared preferences
findPreference("pref_androidacy_repo_api_key").setOnPreferenceChangeListener((preference, newValue) -> {
MainApplication.getSharedPreferences().edit()
.putString("androidacy_api_token", String.valueOf(newValue)).apply();
return true;
// Create the pref_androidacy_repo_api_key text input
EditTextPreference prefAndroidacyRepoApiKey = new EditTextPreference(this.requireContext());
prefAndroidacyRepoApiKey.setKey("pref_androidacy_repo_api_key");
prefAndroidacyRepoApiKey.setTitle(R.string.api_key);
prefAndroidacyRepoApiKey.setDialogTitle(R.string.api_key);
// Set the summary to the current androidacy_api_token
prefAndroidacyRepoApiKey.setSummary(MainApplication.getSharedPreferences()
.getString("androidacy_api_token", ""));
prefAndroidacyRepoApiKey.setOnBindEditTextListener(editText -> {
editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
});
// Bind ok button to save the new androidacy_api_token
// On hitting OK, save the new androidacy_api_token after checking it. While checking, show a progress dialog
prefAndroidacyRepoApiKey.setOnPreferenceChangeListener((preference, newValue) -> {
String newToken = String.valueOf(newValue);
if (newToken.isEmpty()) {
MainApplication.getSharedPreferences().edit()
.remove("androidacy_api_token").apply();
return true;
}
ProgressDialog progressDialog = new ProgressDialog(this.requireContext());
progressDialog.setMessage(getString(R.string.checking_api_key));
progressDialog.setCancelable(false);
progressDialog.show();
new Thread(() -> {
try {
String response = new OkHttpClient().newCall(new Request.Builder()
.url("https://production-api.androidacy.com/auth/me")
.header("Authorization", "Bearer " + newToken)
.build()).execute().body().string();
JSONObject jsonObject = new JSONObject(response);
if (!jsonObject.has("role")) {
throw new IOException("Invalid response");
}
MainApplication.getSharedPreferences().edit()
.putString("androidacy_api_token", newToken).apply();
progressDialog.dismiss();
this.requireActivity().runOnUiThread(() -> {
prefAndroidacyRepoApiKey.setSummary(newToken);
Toast.makeText(this.requireContext(),
R.string.api_key_valid, Toast.LENGTH_SHORT).show();
});
} catch (IOException | JSONException e) {
progressDialog.dismiss();
this.requireActivity().runOnUiThread(() -> Toast.makeText(this.requireContext(),
R.string.api_key_invalid, Toast.LENGTH_SHORT).show());
}
}).start();
return false;
});
findPreference("pref_support").setOnPreferenceClickListener(p -> {
devModeStep = 0;

5
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -156,4 +156,9 @@
<string name="crash_reporting_desc">If you disable this, the developer will not get automatic bug reports, and this may make troubleshooting harder</string>
<string name="api_key">Androidacy API Key</string>
<string name="api_key_summary">Use a custom API key for Androidacy</string>
<string name="api_key_not_set">Androidacy API key is empty</string>
<string name="api_key_set">Current Androidacy API key</string>
<string name="api_key_invalid">Could not validate API key. Please try again.</string>
<string name="api_key_valid">API key is valid.</string>
<string name="checking_api_key">Validating API key...</string>
</resources>

Write Preview
Loading…
Cancel
Save