Permalink
Browse files

remove Build ID

F-Droid fails to make reproductible builds with this ID.

Fixes #576
  • Loading branch information...
BLeQuerrec committed May 15, 2017
1 parent 33fa1f6 commit d280969236016cf97e01ffca315e979b90d5c70b
@@ -19,12 +19,11 @@ Also include the value of any relevant preferences you have set in the app.
### Device info
- Device:
- Android version:
-- Silence version and build ID:
+- Silence version:
### Link to debug log
<!--
Immediately after the bug has happened capture a debug log via Settings -> Advanced -> Submit log and paste the link here.
If you can't access the menu, you can use ADB to grab the debug log: `adb logcat | grep $(adb shell ps | grep org.smssecure.smssecure | cut -c10-15)`.
If your debug log contains sensitive data, you can censor it (please don't remove any relevant data) or send it to support@silence.im instead
-->
-
View
@@ -148,13 +148,6 @@ android {
targetSdkVersion 22
vectorDrawables.useSupportLibrary = true
-
- try{
- buildConfigField "String", "BUILD_GIT_COMMIT", "\"" + 'git rev-parse --short HEAD'.execute().text.trim() + "\""
- }
- catch(IOException e){
- buildConfigField "String", "BUILD_GIT_COMMIT", '""'
- }
}
compileOptions {
View
@@ -731,7 +731,6 @@
<string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Enable if your device uses SMS/MMS delivery over Wi-Fi (only enable when \'Wi-Fi Calling\' is enabled on your device).</string>
<string name="preferences__about">About Silence</string>
<string name="preferences__about_version">Version %s</string>
- <string name="preferences__about_build_id">Build ID: %s</string>
<string name="preferences__privacy_policy">Privacy policy</string>
<string name="preferences_app_protection__blocked_contacts">Blocked contacts</string>
<string name="preferences_notifications__display_in_notifications">Display in notifications</string>
@@ -197,12 +197,9 @@ private void setCategorySummaries() {
.setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
String version = String.format(this.getString(R.string.preferences__about_version), BuildConfig.VERSION_NAME);
- String buildID = String.format(this.getString(R.string.preferences__about_build_id), BuildConfig.BUILD_GIT_COMMIT);
-
- String aboutSummary = (BuildConfig.BUILD_GIT_COMMIT.equals("")) ? version : version + "\n" + buildID;
this.findPreference(PREFERENCE_ABOUT)
- .setSummary(aboutSummary);
+ .setSummary(version);
}
private class CategoryClickListener implements Preference.OnPreferenceClickListener {

0 comments on commit d280969

Please sign in to comment.