AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

#252 Install Debug App in parallel with Release App

Browse Source
This commit is contained in:
Julian Raufelder 2021-01-20 18:44:17 +01:00
parent 8e60975cf5
commit 2e2ee0e483
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
6 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -28,7 +28,11 @@ git submodule init && git submodule update // (not necessary if cloned using --r
./gradlew assembleApkstoreDebug ./gradlew assembleApkstoreDebug
``` ```
Before connecting to Onedrive or Dropbox you have to provide valid API keys using environment variables: `ONEDRIVE_API_KEY` or `DROPBOX_API_KEY`. Before connecting to Onedrive or Dropbox you have to provide valid API keys using environment variables:
For build type
* **release**: `ONEDRIVE_API_KEY` or `DROPBOX_API_KEY`.
* **debug**: `ONEDRIVE_API_KEY_DEBUG` or `DROPBOX_API_KEY_DEBUG`.
## License ## License

11
data/build.gradle
View File

@ -17,7 +17,6 @@ android {
buildConfigField 'int', 'VERSION_CODE', "${globalConfiguration["androidVersionCode"]}" buildConfigField 'int', 'VERSION_CODE', "${globalConfiguration["androidVersionCode"]}"
buildConfigField "String", "VERSION_NAME", "\"${globalConfiguration["androidVersionName"]}\"" buildConfigField "String", "VERSION_NAME", "\"${globalConfiguration["androidVersionName"]}\""
buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY') + "\""
} }
compileOptions { compileOptions {
@ -31,6 +30,16 @@ android {
ignoreWarnings true ignoreWarnings true
} }
buildTypes {
release {
buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY') + "\""
}
debug {
buildConfigField "String", "ONEDRIVE_API_KEY", "\"" + getApiKey('ONEDRIVE_API_KEY_DEBUG') + "\""
}
}
flavorDimensions "version" flavorDimensions "version"
productFlavors { productFlavors {

16
presentation/build.gradle
View File

@ -29,9 +29,6 @@ android {
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
buildConfigField "String", "DROPBOX_API_KEY", "\"" + getApiKey('DROPBOX_API_KEY') + "\""
manifestPlaceholders = [DROPBOX_API_KEY: getApiKey('DROPBOX_API_KEY')]
} }
compileOptions { compileOptions {
@ -51,6 +48,11 @@ android {
minifyEnabled false minifyEnabled false
shrinkResources false shrinkResources false
useProguard false useProguard false
buildConfigField "String", "DROPBOX_API_KEY", "\"" + getApiKey('DROPBOX_API_KEY') + "\""
manifestPlaceholders = [DROPBOX_API_KEY: getApiKey('DROPBOX_API_KEY')]
resValue "string", "app_id", androidApplicationId
} }
debug { debug {
@ -60,6 +62,14 @@ android {
minifyEnabled false minifyEnabled false
shrinkResources false shrinkResources false
testCoverageEnabled false testCoverageEnabled false
buildConfigField "String", "DROPBOX_API_KEY", "\"" + getApiKey('DROPBOX_API_KEY_DEBUG') + "\""
manifestPlaceholders = [DROPBOX_API_KEY: getApiKey('DROPBOX_API_KEY_DEBUG')]
applicationIdSuffix ".debug"
versionNameSuffix '-DEBUG'
resValue "string", "app_id", androidApplicationId + applicationIdSuffix
} }
} }

6
presentation/src/debug/res/values/strings.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Debug Cryptomator</string>
</resources>

12
presentation/src/main/AndroidManifest.xml
View File

@ -102,19 +102,17 @@
<!-- Settings --> <!-- Settings -->
<activity android:name=".ui.activity.SettingsActivity" /> <activity android:name=".ui.activity.BiometricAuthSettingsActivity" />
<activity android:name=".ui.activity.LicensesActivity" />
<activity android:name=".ui.activity.CloudSettingsActivity" />
<activity android:name=".ui.activity.WebDavAddOrChangeActivity" />
<activity android:name=".ui.activity.CloudConnectionListActivity" /> <activity android:name=".ui.activity.CloudConnectionListActivity" />
<activity android:name=".ui.activity.CloudSettingsActivity" />
<activity android:name=".ui.activity.LicensesActivity" />
<activity android:name=".ui.activity.SettingsActivity" />
<activity android:name=".ui.activity.WebDavAddOrChangeActivity" />
<activity <activity
android:name=".ui.activity.AuthenticateCloudActivity" android:name=".ui.activity.AuthenticateCloudActivity"
android:theme="@style/Theme.Transparent" /> android:theme="@style/Theme.Transparent" />
<activity android:name=".ui.activity.BiometricAuthSettingsActivity" />
<activity <activity
android:name=".ui.activity.ImagePreviewActivity" android:name=".ui.activity.ImagePreviewActivity"
android:theme="@style/FullscreenTheme" /> android:theme="@style/FullscreenTheme" />

8
presentation/src/main/res/xml/preferences.xml
View File

@ -21,7 +21,7 @@
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.CloudSettingsActivity" android:targetClass="org.cryptomator.presentation.ui.activity.CloudSettingsActivity"
android:targetPackage="org.cryptomator" /> android:targetPackage="@string/app_id" />
</Preference> </Preference>
@ -32,7 +32,7 @@
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity" android:targetClass="org.cryptomator.presentation.ui.activity.BiometricAuthSettingsActivity"
android:targetPackage="org.cryptomator" /> android:targetPackage="@string/app_id" />
</Preference> </Preference>
@ -117,7 +117,7 @@
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.AutoUploadChooseVaultActivity" android:targetClass="org.cryptomator.presentation.ui.activity.AutoUploadChooseVaultActivity"
android:targetPackage="org.cryptomator" /> android:targetPackage="@string/app_id" />
</Preference> </Preference>
</PreferenceCategory> </PreferenceCategory>
@ -204,7 +204,7 @@
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"
android:targetClass="org.cryptomator.presentation.ui.activity.LicensesActivity" android:targetClass="org.cryptomator.presentation.ui.activity.LicensesActivity"
android:targetPackage="org.cryptomator" /> android:targetPackage="@string/app_id" />
</Preference> </Preference>
<Preference android:title="@string/screen_settings_security_label"> <Preference android:title="@string/screen_settings_security_label">