Skip to content

Proofmode Fix #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2025
Merged

Proofmode Fix #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ dependencies {
detektPlugins(libs.detekt.compose)
detektPlugins(libs.detekt.rules.compose)

debugImplementation("com.squareup.leakcanary:leakcanary-android:3.0-alpha-8")
// debugImplementation("com.squareup.leakcanary:leakcanary-android:3.0-alpha-8")
}

configurations.all {
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/net/opendasharchive/openarchive/features/settings/ProofModeSettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
val proofModeSwitch = findPreference<SwitchPreferenceCompat>(Prefs.USE_PROOFMODE)

// Check if permission is granted
val hasPermission = ContextCompat.checkSelfPermission(
requireContext(), Manifest.permission.READ_PHONE_STATE
) == PackageManager.PERMISSION_GRANTED
val hasPermission = ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED

Check warning

Code scanning / detekt

Reports lines with exceeded length Warning

Exceeded max line length (120)
&& ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED

Check warning

Code scanning / detekt

Reports lines with exceeded length Warning

Exceeded max line length (120)

Check warning

Code scanning / detekt

Reports mis-indented code Warning

Unexpected indentation (20) (should be 16)

Check warning

Code scanning / detekt

Checks if condition chaining is wrapped right Warning

Line must not begin with "&&"
&& ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED

Check warning

Code scanning / detekt

Reports mis-indented code Warning

Unexpected indentation (20) (should be 16)

Check warning

Code scanning / detekt

Checks if condition chaining is wrapped right Warning

Line must not begin with "&&"

if (!hasPermission) {
proofModeSwitch?.isChecked = false // Uncheck if permission not granted
Expand All @@ -68,7 +68,7 @@
getPrefByKey<SwitchPreferenceCompat>(R.string.pref_key_use_proof_mode)?.setOnPreferenceChangeListener { preference, newValue ->
if (newValue as Boolean) {
PermissionX.init(this)
.permissions(Manifest.permission.READ_PHONE_STATE)
.permissions(Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)

Check warning

Code scanning / detekt

Reports lines with exceeded length Warning

Exceeded max line length (120)

Check warning

Code scanning / detekt

Reports incorrect argument list wrapping Warning

Argument should be on a separate line (unless all arguments can fit a single line)

Check warning

Code scanning / detekt

Reports incorrect argument list wrapping Warning

Argument should be on a separate line (unless all arguments can fit a single line)

Check warning

Code scanning / detekt

Reports incorrect argument list wrapping Warning

Argument should be on a separate line (unless all arguments can fit a single line)

Check warning

Code scanning / detekt

Reports incorrect argument list wrapping Warning

Missing newline before ")"
.onExplainRequestReason { _, _ ->
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
val uri = Uri.fromParts("package", activity?.packageName, null)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/net/opendasharchive/openarchive/services/Conduit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ abstract class Conduit(
if (!Prefs.useProofMode) return emptyArray()

// Don't use geolocation and network information.
Prefs.proofModeLocation = false
Prefs.proofModeNetwork = false
Prefs.proofModeLocation = true
Prefs.proofModeNetwork = true

try {
var hash = ProofMode.generateProof(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/net/opendasharchive/openarchive/util/ProofModeHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object ProofModeHelper {
if (initialized) return completed()

// Disable ProofMode GPS data tracking by default.
if (Prefs.proofModeLocation) Prefs.proofModeLocation = false
if (Prefs.proofModeLocation) Prefs.proofModeLocation = true

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
val encryptedPassphrase = Prefs.proofModeEncryptedPassphrase
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@


<!-- Strings for ProofMode Activity -->
<string name="phone_permission_required">Phone permission required</string>
<string name="phone_permission_required">Phone and Location permission required</string>

<!-- Strings for nearby sharing -->

Expand Down
Loading