Skip to content

Commit f197597

Browse files
WavesonicsWavesonics
committed
Split OSS and Full builds now
OSS Does not include the proprietary ML Face detection library, and instead just uses the built in Android one
1 parent a806a53 commit f197597

11 files changed

Lines changed: 93 additions & 21 deletions

File tree

‎.github/workflows/publish-release.yml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,21 @@ jobs:
3737
- name: Run Unit Tests
3838
run: ./gradlew test
3939

40-
- name: Build Signed Release APK
40+
- name: Build Signed Full Release APK
4141
env:
4242
KEYSTORE_FILE: gh-release-keystore.jks
4343
KEYSTORE_PASSWORD: ${{ secrets.GH_RELEASE_KEYSTORE_PASSWORD }}
4444
KEY_ALIAS: ${{ secrets.GH_RELEASE_KEY_ALIAS }}
4545
KEY_PASSWORD: ${{ secrets.GH_RELEASE_KEY_PASSWORD }}
46-
run: ./gradlew assembleRelease
46+
run: ./gradlew assembleFullRelease
47+
48+
- name: Build Signed OSS Release APK
49+
env:
50+
KEYSTORE_FILE: gh-release-keystore.jks
51+
KEYSTORE_PASSWORD: ${{ secrets.GH_RELEASE_KEYSTORE_PASSWORD }}
52+
KEY_ALIAS: ${{ secrets.GH_RELEASE_KEY_ALIAS }}
53+
KEY_PASSWORD: ${{ secrets.GH_RELEASE_KEY_PASSWORD }}
54+
run: ./gradlew assembleOssRelease
4755

4856
- name: Get version name
4957
id: get_version
@@ -58,7 +66,9 @@ jobs:
5866
name: Release ${{ env.VERSION_NAME }}
5967
draft: false
6068
prerelease: false
61-
files: app/build/outputs/apk/release/app-release.apk
69+
files: |
70+
app/build/outputs/apk/fullRelease/app-full-release.apk
71+
app/build/outputs/apk/ossRelease/app-oss-release.apk
6272
token: ${{ secrets.GITHUB_TOKEN }}
6373

6474
build-and-publish-play-store:
@@ -94,13 +104,13 @@ jobs:
94104
run: |
95105
echo $ENCODED_KEYSTORE | base64 -d > app/keystore.jks
96106
97-
- name: Build Release AAB
107+
- name: Build Full Release AAB
98108
env:
99109
KEYSTORE_FILE: keystore.jks
100110
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
101111
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
102112
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
103-
run: ./gradlew bundleRelease
113+
run: ./gradlew bundleFullRelease
104114

105115
- name: Setup Fastlane
106116
run: |

‎app/build.gradle.kts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ android {
3636
}
3737
}
3838

39+
flavorDimensions += "version"
40+
productFlavors {
41+
create("oss") {
42+
dimension = "version"
43+
}
44+
create("full") {
45+
dimension = "version"
46+
}
47+
}
3948
buildTypes {
4049
release {
4150
isMinifyEnabled = true
@@ -103,10 +112,11 @@ dependencies {
103112
implementation(libs.androidx.lifecycle.runtime.compose)
104113
implementation(libs.zoomable)
105114
implementation(libs.androidx.runtime.livedata)
106-
implementation(libs.face.detection)
107115
implementation(libs.bcrypt)
108116
implementation(libs.androidx.work.runtime.ktx)
109117

118+
"fullImplementation"(libs.face.detection)
119+
110120
testImplementation(libs.junit)
111121
testImplementation(libs.koin.test.junit4)
112122
testImplementation(libs.koin.android.test)

‎app/src/full/AndroidManifest.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<application
6+
android:name=".FullSnapSafeApplication"
7+
tools:replace="android:name">
8+
</application>
9+
10+
</manifest>

‎app/src/full/kotlin/com/darkrockstudios/app/securecamera/FullSnapSafeApplication.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.darkrockstudios.app.securecamera
2+
3+
import com.darkrockstudios.app.securecamera.obfuscation.FacialDetection
4+
import com.darkrockstudios.app.securecamera.obfuscation.MlFacialDetection
5+
import org.koin.core.module.Module
6+
import org.koin.core.module.dsl.factoryOf
7+
import org.koin.dsl.bind
8+
import org.koin.dsl.module
9+
10+
class FullSnapSafeApplication : SnapSafeApplication() {
11+
override fun flavorModule(): Module = module {
12+
factoryOf(::MlFacialDetection) bind FacialDetection::class
13+
}
14+
}

app/src/main/kotlin/com/darkrockstudios/app/securecamera/obfuscation/MlFacialDetection.kt renamed to app/src/full/kotlin/com/darkrockstudios/app/securecamera/obfuscation/MlFacialDetection.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ class MlFacialDetection : FacialDetection {
2525
detector.process(inputImage)
2626
.addOnSuccessListener { foundFaces ->
2727
val newRegions = foundFaces.map { face ->
28-
val leftEye = face.allLandmarks.find { it.landmarkType == FaceLandmark.LEFT_EYE }
29-
val rightEye = face.allLandmarks.find { it.landmarkType == FaceLandmark.RIGHT_EYE }
28+
val leftEye =
29+
face.allLandmarks.find { it.landmarkType == FaceLandmark.LEFT_EYE }
30+
val rightEye =
31+
face.allLandmarks.find { it.landmarkType == FaceLandmark.RIGHT_EYE }
3032
val eyes = if (leftEye != null && rightEye != null) {
3133
FacialDetection.FoundFace.Eyes(
3234
left = leftEye.position,
@@ -42,7 +44,7 @@ class MlFacialDetection : FacialDetection {
4244
}
4345
continuation.resume(newRegions)
4446
}.addOnFailureListener { e ->
45-
Timber.e(e, "Failed face detection in Image")
47+
Timber.Forest.e(e, "Failed face detection in Image")
4648
continuation.resume(emptyList())
4749
}
4850
}

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/AppModule.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import com.darkrockstudios.app.securecamera.camera.ThumbnailCache
88
import com.darkrockstudios.app.securecamera.gallery.GalleryViewModel
99
import com.darkrockstudios.app.securecamera.import.ImportPhotosViewModel
1010
import com.darkrockstudios.app.securecamera.introduction.IntroductionViewModel
11-
import com.darkrockstudios.app.securecamera.obfuscation.FacialDetection
12-
import com.darkrockstudios.app.securecamera.obfuscation.MlFacialDetection
1311
import com.darkrockstudios.app.securecamera.obfuscation.ObfuscatePhotoViewModel
1412
import com.darkrockstudios.app.securecamera.preferences.AppPreferencesDataSource
1513
import com.darkrockstudios.app.securecamera.security.DeviceInfo
@@ -54,7 +52,6 @@ val appModule = module {
5452
factoryOf(::VerifyPinUseCase)
5553
factoryOf(::CreatePinUseCase)
5654
factoryOf(::PinSizeUseCase)
57-
factoryOf(::MlFacialDetection) bind FacialDetection::class
5855

5956
viewModelOf(::ObfuscatePhotoViewModel)
6057
viewModelOf(::ViewPhotoViewModel)

‎app/src/main/kotlin/com/darkrockstudios/app/securecamera/SnapSafeApplication.kt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ import org.koin.android.ext.koin.androidLogger
1111
import org.koin.core.component.KoinComponent
1212
import org.koin.core.component.inject
1313
import org.koin.core.context.startKoin
14+
import org.koin.core.module.Module
15+
import org.koin.dsl.module
1416
import timber.log.Timber
1517

16-
class SnapSafeApplication : Application(), KoinComponent {
18+
open class SnapSafeApplication : Application(), KoinComponent {
1719
private val imageManager by inject<SecureImageRepository>()
1820
private val preferences by inject<AppPreferencesDataSource>()
1921
private val securityReset by inject<SecurityResetUseCase>()
@@ -30,12 +32,14 @@ class SnapSafeApplication : Application(), KoinComponent {
3032
startKoin {
3133
androidLogger()
3234
androidContext(this@SnapSafeApplication)
33-
modules(appModule)
35+
modules(appModule, flavorModule())
3436
}
3537

3638
handleMigrationFromBeta()
3739
}
3840

41+
open fun flavorModule(): Module = module { }
42+
3943
override fun onTrimMemory(level: Int) {
4044
super.onTrimMemory(level)
4145
imageManager.thumbnailCache.clear()

‎app/src/oss/AndroidManifest.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<application
6+
android:name=".OssSnapSafeApplication"
7+
tools:replace="android:name">
8+
</application>
9+
10+
</manifest>

‎app/src/oss/kotlin/com/darkrockstudios/app/securecamera/OssSnapSafeApplication.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.darkrockstudios.app.securecamera
2+
3+
import com.darkrockstudios.app.securecamera.obfuscation.AndroidFacialDetection
4+
import com.darkrockstudios.app.securecamera.obfuscation.FacialDetection
5+
import org.koin.core.module.Module
6+
import org.koin.core.module.dsl.factoryOf
7+
import org.koin.dsl.bind
8+
import org.koin.dsl.module
9+
10+
class OssSnapSafeApplication : SnapSafeApplication() {
11+
override fun flavorModule(): Module = module {
12+
factoryOf(::AndroidFacialDetection) bind FacialDetection::class
13+
}
14+
}

app/src/main/kotlin/com/darkrockstudios/app/securecamera/obfuscation/AndroidFacialDetection.kt renamed to app/src/oss/kotlin/com/darkrockstudios/app/securecamera/obfuscation/AndroidFacialDetection.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.darkrockstudios.app.securecamera.obfuscation
22

33
import android.graphics.Bitmap
4+
import android.graphics.Canvas
45
import android.graphics.PointF
56
import android.graphics.Rect
67
import android.media.FaceDetector
@@ -16,11 +17,11 @@ class AndroidFacialDetection : FacialDetection {
1617
val bitmapForDetection = if (bitmap.config != Bitmap.Config.RGB_565) {
1718
try {
1819
createBitmap(bitmap.width, bitmap.height, Bitmap.Config.RGB_565).also { targetBitmap ->
19-
val canvas = android.graphics.Canvas(targetBitmap)
20+
val canvas = Canvas(targetBitmap)
2021
canvas.drawBitmap(bitmap, 0f, 0f, null)
2122
}
2223
} catch (e: Exception) {
23-
Timber.e(e, "Failed to convert bitmap to RGB_565")
24+
Timber.Forest.e(e, "Failed to convert bitmap to RGB_565")
2425
return@withContext emptyList<FacialDetection.FoundFace>()
2526
}
2627
} else {
@@ -36,7 +37,7 @@ class AndroidFacialDetection : FacialDetection {
3637

3738
// Find faces in the bitmap
3839
val facesFound = detector.findFaces(bitmapForDetection, faces)
39-
Timber.d("Found $facesFound faces using Android FaceDetector")
40+
Timber.Forest.d("Found $facesFound faces using Android FaceDetector")
4041

4142
// Convert the detected faces to our FoundFace format
4243
val foundFaces = mutableListOf<FacialDetection.FoundFace>()
@@ -88,8 +89,8 @@ class AndroidFacialDetection : FacialDetection {
8889

8990
foundFaces
9091
} catch (e: Exception) {
91-
Timber.e(e, "Error detecting faces with Android FaceDetector")
92+
Timber.Forest.e(e, "Error detecting faces with Android FaceDetector")
9293
emptyList()
9394
}
9495
}
95-
}
96+
}

0 commit comments

Comments
 (0)