Skip to content

Commit 94c834d

Browse files
fix crashing
Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent 8d0aa1b commit 94c834d

6 files changed

Lines changed: 30 additions & 16 deletions

File tree

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ The Androidacy Module Manager serves as a robust alternative to the official Mag
2828
- **Security:** Automatic VirusTotal scans.
2929
- **Community Engagement:** Module reviews.
3030
- **Revenue Sharing:** Financially rewards module developers.
31-
- **Ad-Supported:** Ads allow us to keep this app and our repository free, but can be removed with a subscription. [Subscribe Now](https://www.androidacy.com/membership-join/?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme)
31+
- **Ad-Supported:** Ads allow us to keep this app and our repository free while being able to support and maintain it, but can be removed with a subscription. [Subscribe Now](https://www.androidacy.com/membership-join/?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme)
3232

3333
### Future Updates
3434

35-
- Repository Creation Wizard
36-
- Module Creation Tool
35+
- AMM v3 beta in January
3736

3837
### Screenshots
3938

@@ -64,25 +63,23 @@ Join our [Telegram Group](https://telegram.dog/androidacy_discussions?utm_source
6463
6564
## Installation Guidelines
6665

67-
Visit [our website](https://www.androidacy.com/downloads/?view=FoxMMM&utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme) to download the latest `.apk`.
66+
Visit [our website](https://www.androidacy.com/downloads/?view=FoxMMM&utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme) to download the latest `.apk` for your device arch.
6867

6968
## Developer Guidelines
7069

7170
Consult our [Developer Documentation](docs/DEVELOPERS.md?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme).
7271

7372
## Translation Contributions
7473

75-
Visit our [Weblate page](https://translate.nift4.org/engage/foxmmm/?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme). Advanced users may also send us a pull request on GitHub.
76-
77-
<a href="http://translate.nift4.org/engage/foxmmm/">
78-
<img src="http://translate.nift4.org/widgets/foxmmm/-/287x66-grey.png" alt="Translation status" />
79-
</a>
74+
**WEBLATE NO LONGER AVAILABLE.** Advanced users may also send us a pull request on GitHub.
8075

8176
## Legal and Compliance
8277

8378

8479
By using this application, you agree to abide by our [Terms of Service](https://www.androidacy.com/terms/?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme), our [LICENSE](LICENCE?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme) and the [EULA](https://www.androidacy.com/foxmmm-eula/?utm_source=fox-readme&utm_medium=web&utm_campaign=github-readme). **If you do not agree to any of those terms, you are to discontinue usage of the app immediately.**
8580

81+
__The terms of the EULA are in addition to the LGPL, not in replacement or subversion of, regarding your relatiomship with Androidacy. Our Terms apply to usage of any of our services, which this app makes usage of.__
82+
8683
## Disclaimer
8784

8885

@@ -93,4 +90,4 @@ THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
9390
9491

9592

96-
<sup><sub>This app was originally known as Fox's Magisk Module Manager (FoxMMM). We thank Fox2Code for the foundational work on this app.</sub></sup>
93+
<sup><sub>This app was originally known as Fox's Magisk Module Manager (FoxMMM). We thank Fox2Code for the foundational work on this app.</sub></sup>

app/src/main/kotlin/com/fox2code/mmm/repo/CustomRepoManager.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class CustomRepoManager internal constructor(
3636
val applicationContext = mainApplication!!.applicationContext
3737
val db = Room.databaseBuilder(
3838
applicationContext, ReposListDatabase::class.java, "ReposList.db"
39-
).build()
39+
).allowMainThreadQueries().build()
4040
val reposListDao = db.reposListDao()
4141
val reposListList = reposListDao.getAll()
4242
for (reposList in reposListList) {
@@ -112,7 +112,7 @@ class CustomRepoManager internal constructor(
112112
val applicationContext = INSTANCE!!.applicationContext
113113
val db = Room.databaseBuilder(
114114
applicationContext, ReposListDatabase::class.java, "ReposList.db"
115-
).build()
115+
).allowMainThreadQueries().build()
116116
val reposListDao = db.reposListDao()
117117
val reposList = ReposList(id, repo, true, donate, support, submitModule, 0, name, website)
118118
reposListDao.insert(reposList)
@@ -145,7 +145,7 @@ class CustomRepoManager internal constructor(
145145
repoCount--
146146
val customRepoData = repoManager[oldRepo] as CustomRepoData
147147
if (customRepoData != null) {
148-
customRepoData.isEnabled = false
148+
//customRepoData.isEnabled = false
149149
customRepoData.override = null
150150
}
151151
dirty = true
@@ -179,4 +179,4 @@ class CustomRepoManager internal constructor(
179179
const val MAX_CUSTOM_REPOS = 5
180180
private const val AUTO_RECOMPILE = true
181181
}
182-
}
182+
}

app/src/main/kotlin/com/fox2code/mmm/settings/RepoFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ class RepoFragment : PreferenceFragmentCompat() {
415415
val customRepoManager = RepoManager.getINSTANCE()!!.customRepoManager
416416
for (i in 0 until custRepoEntries) {
417417
// get the id of the repo at current index in customRepos
418-
val repoData = customRepoManager!!.getRepo(customRepos[i])
418+
val repoData = customRepoManager!!.getRepo(db.reposListDao().getUrl(customRepos[i]))
419419
// convert repoData to a json string for logging
420420
if (MainApplication.forceDebugLogging) Timber.d("RepoData for %d is %s", i, repoData.toJSON())
421421
setRepoData(repoData, "pref_custom_repo_$i")

app/src/main/kotlin/com/fox2code/mmm/settings/SettingsActivity.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
*/
44
package com.fox2code.mmm.settings
55

6+
import android.net.Uri
7+
import com.fox2code.mmm.utils.IntentHelper
68
import android.annotation.SuppressLint
79
import android.app.ActivityManager
810
import android.content.ClipboardManager
@@ -240,6 +242,15 @@ class SettingsActivity : AppCompatActivity(), LanguageActivity,
240242
libsBuilder.start(requireContext())
241243
return@OnPreferenceClickListener true
242244
}
245+
findPreference<Preference>("pref_show_apps")!!.onPreferenceClickListener =
246+
Preference.OnPreferenceClickListener { _: Preference? ->
247+
val browserIntent = Intent(
248+
Intent.ACTION_VIEW,
249+
Uri.parse("https://play.google.com/store/apps/dev?id=6763514284252789381")
250+
)
251+
startActivity(browserIntent)
252+
return@OnPreferenceClickListener true
253+
}
243254
}
244255

245256
}
@@ -297,4 +308,4 @@ class SettingsActivity : AppCompatActivity(), LanguageActivity,
297308
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN).addToBackStack(null).commit()
298309
return true
299310
}
300-
}
311+
}

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,4 +429,5 @@
429429
<string name="install_from_storage_file_not_found">Could not find selected file. Please try again.</string>
430430
<string name="invalid_update_url">No update URL found</string>
431431
<string name="invalid_update_url_message">Could not determine a suitable URL to reinstall or update this module from. Please check with the source you got this module from.</string>
432+
<string name="show_apps">Our other apps</string>
432433
</resources>

app/src/main/res/xml/root_preferences.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
app:singleLineTitle="false"
7777
app:title="@string/show_licenses" />
7878

79+
<Preference
80+
app:icon="@drawable/ic_baseline_list_24"
81+
app:key="pref_show_apps"
82+
app:singleLineTitle="false"
83+
app:title="@string/show_apps" />
7984

8085
<Preference
8186
app:enabled="true"

0 commit comments

Comments
 (0)