Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure app BuildConfig is used and not the one from the SDK

Browse source
This commit is contained in:
Sylvain Berfini 2019-09-27 17:24:38 +02:00
parent 8e4c2ceaef
commit ff66a63bdb
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/LinphoneContext.java
View file

@ -255,10 +255,10 @@ public class LinphoneContext {
private void dumpLinphoneInformation() { private void dumpLinphoneInformation() {
Log.i("==== Linphone information dump ===="); Log.i("==== Linphone information dump ====");
Log.i("VERSION NAME=" + BuildConfig.VERSION_NAME); Log.i("VERSION NAME=" + org.linphone.BuildConfig.VERSION_NAME);
Log.i("VERSION CODE=" + BuildConfig.VERSION_CODE); Log.i("VERSION CODE=" + org.linphone.BuildConfig.VERSION_CODE);
Log.i("PACKAGE=" + BuildConfig.APPLICATION_ID); Log.i("PACKAGE=" + org.linphone.BuildConfig.APPLICATION_ID);
Log.i("BUILD TYPE=" + BuildConfig.BUILD_TYPE); Log.i("BUILD TYPE=" + org.linphone.BuildConfig.BUILD_TYPE);
Log.i("SDK VERSION=" + mContext.getString(R.string.linphone_sdk_version)); Log.i("SDK VERSION=" + mContext.getString(R.string.linphone_sdk_version));
Log.i("SDK BRANCH=" + mContext.getString(R.string.linphone_sdk_branch)); Log.i("SDK BRANCH=" + mContext.getString(R.string.linphone_sdk_branch));
} }

3
app/src/main/java/org/linphone/LinphoneManager.java
View file

@ -49,7 +49,6 @@ import org.linphone.call.CallManager;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
import org.linphone.core.AccountCreator; import org.linphone.core.AccountCreator;
import org.linphone.core.AccountCreatorListenerStub; import org.linphone.core.AccountCreatorListenerStub;
import org.linphone.core.BuildConfig;
import org.linphone.core.Call; import org.linphone.core.Call;
import org.linphone.core.Call.State; import org.linphone.core.Call.State;
import org.linphone.core.ConfiguringState; import org.linphone.core.ConfiguringState;
@ -485,7 +484,7 @@ public class LinphoneManager implements SensorEventListener {
String deviceName = mPrefs.getDeviceName(mContext); String deviceName = mPrefs.getDeviceName(mContext);
String appName = mContext.getResources().getString(R.string.user_agent); String appName = mContext.getResources().getString(R.string.user_agent);
String androidVersion = BuildConfig.VERSION_NAME; String androidVersion = org.linphone.BuildConfig.VERSION_NAME;
String userAgent = appName + "/" + androidVersion + " (" + deviceName + ") LinphoneSDK"; String userAgent = appName + "/" + androidVersion + " (" + deviceName + ") LinphoneSDK";
mCore.setUserAgent( mCore.setUserAgent(

6
app/src/main/java/org/linphone/activities/AboutActivity.java
View file

@ -33,7 +33,6 @@ import android.widget.Button;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import org.linphone.BuildConfig;
import org.linphone.LinphoneManager; import org.linphone.LinphoneManager;
import org.linphone.R; import org.linphone.R;
import org.linphone.core.Core; import org.linphone.core.Core;
@ -77,7 +76,10 @@ public class AboutActivity extends MainActivity {
aboutVersion.setText( aboutVersion.setText(
String.format( String.format(
getString(R.string.about_version), getString(R.string.about_version),
BuildConfig.VERSION_NAME + " (" + BuildConfig.BUILD_TYPE + ")")); org.linphone.BuildConfig.VERSION_NAME
+ " ("
+ org.linphone.BuildConfig.BUILD_TYPE
+ ")"));
TextView privacyPolicy = findViewById(R.id.privacy_policy_link); TextView privacyPolicy = findViewById(R.id.privacy_policy_link);
privacyPolicy.setOnClickListener( privacyPolicy.setOnClickListener(