refactor

androidacy-user · androidacy-user · commit e57829f21d3b · 2023-05-09T13:58:46.000-04:00
Signed-off-by: androidacy-user &lt;opensource@androidacy.com&gt;
diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.java b/app/src/main/java/com/fox2code/mmm/MainApplication.java
@@ -581,7 +581,7 @@ public byte[] getKey() {
                 //noinspection BusyWait
                 Thread.sleep(100);
             } catch (InterruptedException ignored) {
-                // silence is bliss
+                Thread.currentThread().interrupt();
             }
         }
         // attempt to read the existingKey property
@@ -607,7 +607,9 @@ public byte[] getKey() {
         }
         // create a securely generated random asymmetric RSA key
         byte[] realmKey = new byte[Realm.ENCRYPTION_KEY_LENGTH];
-        new SecureRandom().nextBytes(realmKey);
+        do {
+            new SecureRandom().nextBytes(realmKey);
+        } while (realmKey[0] == 0);
         // create a cipher that uses AES encryption -- we'll use this to encrypt our key
         Cipher cipher;
         try {
diff --git a/app/src/main/java/com/fox2code/mmm/SetupActivity.java b/app/src/main/java/com/fox2code/mmm/SetupActivity.java
@@ -204,7 +204,7 @@ protected void onCreate(Bundle savedInstanceState) {
             try {
                 Thread.sleep(250);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Thread.currentThread().interrupt();
             }
             // Log the changes
             Timber.d("Setup finished. Preferences: %s", prefs.getAll());
@@ -218,7 +218,7 @@ protected void onCreate(Bundle savedInstanceState) {
             try {
                 pendingIntent.send();
             } catch (PendingIntent.CanceledException e) {
-                e.printStackTrace();
+                Timber.e(e);
             }
             android.os.Process.killProcess(android.os.Process.myPid());
         });
diff --git a/app/src/main/java/com/fox2code/mmm/UpdateActivity.java b/app/src/main/java/com/fox2code/mmm/UpdateActivity.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Objects;
 
 import io.noties.markwon.Markwon;
@@ -223,7 +224,7 @@ public void downloadUpdate() throws JSONException {
             });
         }
         // convert to JSON
-        JSONObject latestJSON = new JSONObject(new String(lastestJSON));
+        JSONObject latestJSON = new JSONObject(Arrays.toString(lastestJSON));
         String changelog = latestJSON.getString("body");
         // set changelog text. changelog could be markdown, so we need to convert it to HTML
         MaterialTextView changelogTextView = findViewById(R.id.update_changelog);
diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java
@@ -34,6 +34,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -154,7 +155,7 @@ public boolean isValidToken(String token) throws IOException {
         try {
             byte[] resp = Http.doHttpGet("https://" + this.host + "/auth/me?token=" + token + "&device_id=" + deviceId + "&client_id=" + BuildConfig.ANDROIDACY_CLIENT_ID, false);
             // response is JSON
-            JSONObject jsonObject = new JSONObject(new String(resp));
+            JSONObject jsonObject = new JSONObject(Arrays.toString(resp));
             memberLevel = jsonObject.getString("role");
             JSONArray memberPermissions = jsonObject.getJSONArray("permissions");
             // set role and permissions on userInfo property
@@ -251,7 +252,7 @@ protected boolean prepare() {
             try {
                 Timber.i("Requesting new token...");
                 // POST json request to https://production-api.androidacy.com/auth/register
-                token = new String(Http.doHttpPost("https://" + this.host + "/auth/register?client_id=" + BuildConfig.ANDROIDACY_CLIENT_ID, "{\"device_id\":\"" + deviceId + "\"}", false));
+                token = Arrays.toString(Http.doHttpPost("https://" + this.host + "/auth/register?client_id=" + BuildConfig.ANDROIDACY_CLIENT_ID, "{\"device_id\":\"" + deviceId + "\"}", false));
                 // Parse token
                 try {
                     JSONObject jsonObject = new JSONObject(token);
diff --git a/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyUtil.java b/app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyUtil.java
@@ -9,6 +9,7 @@
 import com.fox2code.mmm.utils.io.net.Http;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Objects;
 
 public enum AndroidacyUtil {
@@ -132,6 +133,6 @@ public static String getMarkdownFromAPI(String url) {
         if (md == null) {
             return null;
         }
-        return new String(md);
+        return Arrays.toString(md);
     }
 }
diff --git a/app/src/main/java/com/fox2code/mmm/background/BackgroundUpdateChecker.java b/app/src/main/java/com/fox2code/mmm/background/BackgroundUpdateChecker.java
@@ -206,7 +206,7 @@ static void doCheck(Context context) {
                         postNotificationForAppUpdate(context);
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    Timber.e("Failed to check for app update");
                 }
             }
             // remove checking notification
diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
@@ -312,7 +312,6 @@ private void doInstall(File file, boolean noExtensions, boolean rootless) {
                 return;
             }
             this.installerTerminal.enableAnsi();
-            // Extract customize.sh manually in rootless mode because unzip might not exists
             try (ZipFile zipFile = new ZipFile(file)) {
                 ZipArchiveEntry zipEntry = zipFile.getEntry("customize.sh");
                 if (zipEntry != null) {
diff --git a/app/src/main/java/com/fox2code/mmm/repo/CustomRepoManager.java b/app/src/main/java/com/fox2code/mmm/repo/CustomRepoManager.java
@@ -9,6 +9,7 @@
 import org.json.JSONObject;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
@@ -74,7 +75,7 @@ public CustomRepoData addRepo(String repo) {
         // parse json
         JSONObject jsonObject;
         try {
-            jsonObject = new JSONObject(new String(json));
+            jsonObject = new JSONObject(Arrays.toString(json));
         } catch (Exception e) {
             Timber.e(e, "Failed to parse json from repo");
             return null;
diff --git a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
@@ -20,6 +20,7 @@
 import android.os.Looper;
 import android.provider.Settings;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
 import android.view.View;
 import android.view.ViewGroup;
@@ -648,6 +649,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                         materialTextView.setText(localModuleInfo.name);
                         layout.addView(materialTextView);
                         EditText editText = new EditText(this.requireContext());
+                        editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
                         editText.setLayoutParams(params);
                         editText.setHint(R.string.background_update_check_excludes_version_hint);
                         // stringset uses id:version, we show version for name
@@ -907,9 +909,10 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 Timber.d("Version clicks: %d", ref.versionClicks);
                 // if it's been 3 clicks, toast "yer a wizard, harry" or "keep tapping to enter hogwarts"
                 if (ref.versionClicks == 3) {
-                    // pick 1 or 2
-                    int random = new Random().nextInt(2) + 1;
-                    Toast.makeText(p.getContext(), random == 1 ? R.string.yer_a_wizard_harry : R.string.keep_tapping_to_enter_hogwarts, Toast.LENGTH_SHORT).show();
+                    // random choice of 1 or 2
+                    Random rand = new Random();
+                    int n = rand.nextInt(2) + 1;
+                    Toast.makeText(p.getContext(), n == 1 ? R.string.yer_a_wizard_harry : R.string.keep_tapping_to_enter_hogwarts, Toast.LENGTH_SHORT).show();
                 }
                 if (ref.versionClicks == 7) {
                     ref.versionClicks = 0;
diff --git a/app/src/main/java/com/fox2code/mmm/utils/io/net/WebkitCookieManagerProxy.java b/app/src/main/java/com/fox2code/mmm/utils/io/net/WebkitCookieManagerProxy.java
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
@@ -41,15 +40,13 @@ public void put(URI uri, Map<String, List<String>> responseHeaders)
         String url = uri.toString();
 
         // go over the headers
-        for (String headerKey : responseHeaders.keySet()) {
+        for (Map.Entry<String, List<String>> entry : responseHeaders.entrySet()) {
             // ignore headers which aren't cookie related
-            if ((headerKey == null)
-                    || !(headerKey.equalsIgnoreCase("Set-Cookie2") || headerKey
-                    .equalsIgnoreCase("Set-Cookie")))
+            if ((entry.getKey() == null)
+                    || !(entry.getKey().equalsIgnoreCase("Set-Cookie2") || entry
+                    .getKey().equalsIgnoreCase("Set-Cookie")))
                 continue;
-
-            // process each of the headers
-            for (String headerValue : Objects.requireNonNull(responseHeaders.get(headerKey))) {
+            for (String headerValue : entry.getValue()) {
                 webkitCookieManager.setCookie(url, headerValue);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ public byte[] getKey() {`
`581`	`581`	`//noinspection BusyWait`
`582`	`582`	`Thread.sleep(100);`
`583`	`583`	`} catch (InterruptedException ignored) {`
`584`		`- // silence is bliss`
	`584`	`+ Thread.currentThread().interrupt();`
`585`	`585`	`}`
`586`	`586`	`}`
`587`	`587`	`// attempt to read the existingKey property`
`@@ -607,7 +607,9 @@ public byte[] getKey() {`
`607`	`607`	`}`
`608`	`608`	`// create a securely generated random asymmetric RSA key`
`609`	`609`	`byte[] realmKey = new byte[Realm.ENCRYPTION_KEY_LENGTH];`
`610`		`- new SecureRandom().nextBytes(realmKey);`
	`610`	`+ do {`
	`611`	`+ new SecureRandom().nextBytes(realmKey);`
	`612`	`+ } while (realmKey[0] == 0);`
`611`	`613`	`// create a cipher that uses AES encryption -- we'll use this to encrypt our key`
`612`	`614`	`Cipher cipher;`
`613`	`615`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import com.fox2code.mmm.utils.io.net.Http;`
`10`	`10`
`11`	`11`	`import java.io.IOException;`
	`12`	`+import java.util.Arrays;`
`12`	`13`	`import java.util.Objects;`
`13`	`14`
`14`	`15`	`public enum AndroidacyUtil {`
`@@ -132,6 +133,6 @@ public static String getMarkdownFromAPI(String url) {`
`132`	`133`	`if (md == null) {`
`133`	`134`	`return null;`
`134`	`135`	`}`
`135`		`- return new String(md);`
	`136`	`+ return Arrays.toString(md);`
`136`	`137`	`}`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static void doCheck(Context context) {`
`206`	`206`	`postNotificationForAppUpdate(context);`
`207`	`207`	`}`
`208`	`208`	`} catch (Exception e) {`
`209`		`- e.printStackTrace();`
	`209`	`+ Timber.e("Failed to check for app update");`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`// remove checking notification`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,6 @@ private void doInstall(File file, boolean noExtensions, boolean rootless) {`
`312`	`312`	`return;`
`313`	`313`	`}`
`314`	`314`	`this.installerTerminal.enableAnsi();`
`315`		`- // Extract customize.sh manually in rootless mode because unzip might not exists`
`316`	`315`	`try (ZipFile zipFile = new ZipFile(file)) {`
`317`	`316`	`ZipArchiveEntry zipEntry = zipFile.getEntry("customize.sh");`
`318`	`317`	`if (zipEntry != null) {`