aiden
/
MagiskModuleManager
mirror of https://github.com/Androidacy/MagiskModuleManager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix validation of api key

Browse Source 
Still saves the invalid key though

Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/27/head
androidacy-user 3 years ago
parent 9052703c81
commit f76ad4154f
4 changed files with 106 additions and 74 deletions
Show Stats Download Patch File Download Diff File

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

@ -3,6 +3,7 @@ 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;
@ -36,6 +37,7 @@ import com.fox2code.mmm.Constants;
import com.fox2code.mmm.MainActivity;
import com.fox2code.mmm.MainApplication;
import com.fox2code.mmm.R;
import com.fox2code.mmm.androidacy.AndroidacyRepoData;
import com.fox2code.mmm.background.BackgroundUpdateChecker;
import com.fox2code.mmm.installer.InstallerInitializer;
import com.fox2code.mmm.module.ActionButtonType;
@ -53,7 +55,6 @@ import com.google.android.material.textfield.MaterialAutoCompleteTextView;
import com.mikepenz.aboutlibraries.LibsBuilder;
import com.topjohnwu.superuser.internal.UiThreadHandler;
import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import java.io.IOException;
@ -61,12 +62,6 @@ import java.util.HashSet;
import java.util.Objects;
import java.util.Random;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
public class SettingsActivity extends FoxActivity implements LanguageActivity {
private static final int LANGUAGE_SUPPORT_LEVEL = 1;
private static final String TAG = "SettingsActivity";
@ -96,7 +91,7 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
int mPendingIntentId = 123456;
PendingIntent mPendingIntent = PendingIntent.getActivity(this, mPendingIntentId,
mStartActivity, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
AlarmManager mgr = (AlarmManager)this.getSystemService(Context.ALARM_SERVICE);
AlarmManager mgr = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent);
System.exit(0); // Exit app process
}
@ -280,51 +275,6 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
"https://github.com/Fox2Code/FoxMagiskModuleManager");
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", ""));
// On user input, save the new androidacy_api_token after validating it
prefAndroidacyRepoApiKey.setOnPreferenceChangeListener((preference, newValue) -> {
String newToken = String.valueOf(newValue);
if (newToken.length() == 0) {
MainApplication.getSharedPreferences().edit()
.remove("androidacy_api_token").apply();
return true;
}
// Call the androidacy api to validate the token
OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder()
.url("https://production-api.androidacy.com/auth/me")
.header("Authorization", "Bearer " + newToken)
.build();
client.newCall(request).enqueue(new Callback() {
@Override
public void onFailure(@NotNull Call call, @NotNull IOException e) {
// If the request failed, show an error message
new Handler(Looper.getMainLooper()).post(() -> {
Toast.makeText(getContext(), R.string.api_key_invalid,
Toast.LENGTH_SHORT).show();
});
}
@Override
public void onResponse(@NotNull Call call, @NotNull Response response) {
// If the request succeeded, save the token
new Handler(Looper.getMainLooper()).post(() -> {
MainApplication.getSharedPreferences().edit()
.putString("androidacy_api_token", newToken).apply();
Toast.makeText(getContext(), R.string.api_key_valid,
Toast.LENGTH_SHORT).show();
});
}
});
return true;
});
findPreference("pref_support").setOnPreferenceClickListener(p -> {
devModeStep = 0;
IntentHelper.openUrl(p.getContext(), "https://t.me/Fox2Code_Chat");
@ -342,7 +292,8 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
BuildConfig.VERSION_CODE + ")");
}
private SharedPreferences.Editor getCrashReportingEditor(FragmentActivity requireActivity) {
private SharedPreferences.Editor getCrashReportingEditor(FragmentActivity
requireActivity) {
return requireActivity.getSharedPreferences("crash_reporting", Context.MODE_PRIVATE).edit();
}
@ -398,6 +349,73 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
Objects.requireNonNull((Preference) findPreference(
"pref_androidacy_test_mode")).setVisible(false);
}
String originalApiKey = MainApplication.getSharedPreferences()
.getString("pref_androidacy_api_token", "");
// Create the pref_androidacy_repo_api_key text input with validation
EditTextPreference prefAndroidacyRepoApiKey = findPreference("pref_androidacy_repo_api_key");
prefAndroidacyRepoApiKey.setKey("pref_androidacy_repo_api_key");
prefAndroidacyRepoApiKey.setOnBindEditTextListener(editText -> {
editText.setSingleLine();
// Make the single line wrap
editText.setHorizontallyScrolling(false);
// Set the height to the height of 2 lines
editText.setHeight(editText.getLineHeight() * 2);
});
prefAndroidacyRepoApiKey.setOnPreferenceChangeListener((preference, newValue) -> {
// Curious if this actually works - so crash the app on purpose
// throw new RuntimeException("This is a test crash");
// get original api key
String apiKey = String.valueOf(newValue);
// Show progress dialog
ProgressDialog progressDialog = new ProgressDialog(getContext());
progressDialog.setMessage(getString(R.string.checking_api_key));
progressDialog.setCancelable(false);
progressDialog.show();
// Check the API key on a background thread
new Thread(() -> {
// If key is empty, just remove it and show a toast
if (apiKey.isEmpty()) {
MainApplication.getSharedPreferences().edit()
.remove("pref_androidacy_repo_api_key").apply();
new Handler(Looper.getMainLooper()).post(() -> {
progressDialog.dismiss();
Toast.makeText(getContext(), R.string.api_key_removed, Toast.LENGTH_SHORT).show();
});
return;
} else {
// If key < 64 chars, it's not valid
if (apiKey.length() < 64) {
new Handler(Looper.getMainLooper()).post(() -> {
progressDialog.dismiss();
Toast.makeText(getContext(), R.string.api_key_invalid, Toast.LENGTH_SHORT).show();
});
return;
}
}
// Check the API key
boolean valid = AndroidacyRepoData.getInstance().isValidToken(apiKey);
// Update the UI on the main thread
new Handler(Looper.getMainLooper()).post(() -> {
progressDialog.dismiss();
if (valid) {
// Show a success message
Toast.makeText(getContext(), R.string.api_key_valid,
Toast.LENGTH_SHORT).show();
// Save the API key
MainApplication.getSharedPreferences().edit()
.putString("pref_androidacy_api_token", apiKey).apply();
} else {
// Show an error message
Toast.makeText(getContext(), R.string.api_key_invalid,
Toast.LENGTH_SHORT).show();
// Restore the original API key
MainApplication.getSharedPreferences().edit()
.putString("pref_androidacy_api_token", originalApiKey).apply();
}
});
}).start();
return true;
});
}
@SuppressLint("RestrictedApi")
@ -411,7 +429,7 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
setRepoData(repoData, "pref_custom_repo_" + i);
if (initial) {
Preference preference =
findPreference("pref_custom_repo_" + i + "_delete");
findPreference("pref_custom_repo_" + i + "_delete");
if (preference == null) continue;
final int index = i;
preference.setOnPreferenceClickListener(preference1 -> {
@ -450,7 +468,7 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
public void run() {
try {
customRepoData.quickPrePopulate();
} catch (IOException|JSONException e) {
} catch (IOException | JSONException e) {
Log.e(TAG, "Failed to preload repo values", e);
}
UiThreadHandler.handler.post(() -> updateCustomRepoList(false));

10
app/src/main/res/drawable/ic_baseline_vpn_key_24.xml
Unescape Escape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
</vector>

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

@ -155,7 +155,7 @@
<string name="crash_reporting">Automatically report bugs and performance to the developers</string>
<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_summary">Use a custom API key for Androidacy. Useful for premium subscribers, to remove ads and more.</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>
@ -163,4 +163,5 @@
<string name="checking_api_key">Validating API key...</string>
<string name="validating_api_key">Validating API key...</string>
<string name="please_wait">Please wait</string>
<string name="api_key_removed">Successfully reset API key</string>
</resources>

37
app/src/main/res/xml/repo_preferences.xml
Unescape Escape View File

@ -40,6 +40,26 @@
app:switchTextOn="@string/repo_enabled"
app:switchTextOff="@string/repo_disabled"
app:singleLineTitle="false" />
<!-- Allow user to set custom API key for Androidacy repo -->
<EditTextPreference
app:key="pref_androidacy_repo_api_key"
app:icon="@drawable/ic_baseline_vpn_key_24"
app:title="@string/api_key"
app:summary="@string/api_key_summary"
app:singleLineTitle="true"
app:dialogTitle="@string/api_key"
app:dialogIcon="@drawable/ic_baseline_vpn_key_24"
app:dependency="pref_androidacy_repo_enabled"
android:inputType="text"
android:imeOptions="actionDone" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:key="pref_androidacy_test_mode"
app:icon="@drawable/ic_baseline_bug_report_24"
app:title="@string/androidacy_test_mode_pref"
app:summary="@string/androidacy_test_mode_desc"
app:dependency="pref_androidacy_repo_enabled"
app:singleLineTitle="false" />
<Preference
app:key="pref_androidacy_repo_website"
app:icon="@drawable/ic_baseline_language_24"
@ -60,23 +80,6 @@
app:icon="@drawable/ic_baseline_upload_file_24"
app:title="@string/submit_modules"
app:singleLineTitle="false" />
<!-- Allow user to set custom API key for Androidacy repo -->
<EditTextPreference
app:key="pref_androidacy_repo_api_key"
app:icon="@drawable/ic_baseline_security_24"
app:title="@string/api_key"
app:summary="@string/api_key_summary"
app:singleLineTitle="false"
app:dialogTitle="@string/api_key"
app:dialogMessage="@string/api_key_summary"
android:imeOptions="actionDone" />
<SwitchPreferenceCompat
app:defaultValue="false"
app:key="pref_androidacy_test_mode"
app:icon="@drawable/ic_baseline_bug_report_24"
app:title="@string/androidacy_test_mode_pref"
app:summary="@string/androidacy_test_mode_desc"
app:singleLineTitle="false" />
<Preference
app:key="pref_androidacy_ads_disclaimer"
app:icon="@drawable/ic_baseline_info_24"

Write Preview
Loading…
Cancel
Save