Skip to content
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

Jump to bottom

Making sure we do not have AD_ID in the app #1605

Merged
merged 6 commits into from
Aug 7, 2024
Merged

Making sure we do not have AD_ID in the app #1605

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b8d2d4
Making sure we do not have AD_ID in the app
ThomasSession Aug 7, 2024
2c4b8bf
Do not check errors if profileAvatar is null
ThomasSession Aug 7, 2024
76a74f7
Upgraded firebase from v18.0.0 to v24.0.0
alansley Aug 7, 2024
bbac093
Unchecked code
ThomasSession Aug 7, 2024
fe1fe2e
Merge branch 'fix/removing-ad-id' of https://github.com/oxen-io/sessi…
ThomasSession Aug 7, 2024
a742620
Not needed anymre
ThomasSession Aug 7, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ configurations.all {
exclude module: "commons-logging"
}

def canonicalVersionCode = 377
def canonicalVersionCode = 378
def canonicalVersionName = "1.19.0"

def postFixSize = 10
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" tools:node="remove"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>

<queries>
<intent>
Expand Down
2 changes: 1 addition & 1 deletion libsession/src/main/java/org/session/libsession/messaging/jobs/RetrieveProfileAvatarJob.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class RetrieveProfileAvatarJob(private val profileAvatar: String?, val recipient

override suspend fun execute(dispatcherName: String) {
val delegate = delegate ?: return Log.w(TAG, "RetrieveProfileAvatarJob has no delegate method to work with!")
if (profileAvatar in errorUrls) return delegate.handleJobFailed(this, dispatcherName, Exception("Profile URL 404'd this app instance"))
if (profileAvatar != null && profileAvatar in errorUrls) return delegate.handleJobFailed(this, dispatcherName, Exception("Profile URL 404'd this app instance"))
val context = MessagingModuleConfiguration.shared.context
val storage = MessagingModuleConfiguration.shared.storage
val recipient = Recipient.from(context, recipientAddress, true)
Expand Down