Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '515-starting-intent-from-preferences-does-not-work-with-different-app-id' into 'master'

Browse Source 
Allow different package IDs (for preference intents)

Closes #515

See merge request !248
This commit is contained in:
Ernir Erlingsson
2016-07-27 19:34:41 +00:00
parent c47171c06e 7318aa562e
commit 04d2ede2e1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/build.gradle
View File

@@ -77,6 +77,10 @@ android {
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion "23.0.3" buildToolsVersion "23.0.3"
defaultConfig {
resValue "string", "app_package", "org.briarproject"
}
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'

4
briar-android/res/xml/settings.xml
View File

@@ -34,7 +34,7 @@
<intent <intent
android:targetClass="org.briarproject.android.ChangePasswordActivity" android:targetClass="org.briarproject.android.ChangePasswordActivity"
android:targetPackage="org.briarproject"/> android:targetPackage="@string/app_package"/>
</Preference> </Preference>
</PreferenceCategory> </PreferenceCategory>
@@ -48,7 +48,7 @@
<intent <intent
android:targetClass="org.briarproject.android.panic.PanicPreferencesActivity" android:targetClass="org.briarproject.android.panic.PanicPreferencesActivity"
android:targetPackage="org.briarproject"/> android:targetPackage="@string/app_package"/>
</Preference> </Preference>