Skip to content

Commit e40cc70

Browse files
committed
minor bug fixes and library version increment.
1 parent bc94402 commit e40cc70

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

ClientLib/mobile/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
ext {
44
PUBLISH_ARTIFACT_ID = '3dr-services-lib'
5-
PUBLISH_VERSION = '2.1.12'
5+
PUBLISH_VERSION = '2.1.14'
66
PROJECT_DESCRIPTION = "3DR Services client library"
77
PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android']
88
PROJECT_LICENSES = ['Apache-2.0']
@@ -15,7 +15,7 @@ android {
1515
defaultConfig {
1616
minSdkVersion 14
1717
targetSdkVersion 21
18-
versionCode 20112
18+
versionCode 20114
1919
versionName PUBLISH_VERSION
2020
}
2121

ClientLib/mobile/src/main/AndroidManifest.xml

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
android:noHistory="true"
99
android:excludeFromRecents="true"
1010
android:launchMode="singleTask"/>
11+
12+
<activity
13+
android:name=".utils.UpdateServiceDialog"
14+
android:theme="@android:style/Theme.Holo.Light.Dialog.NoActionBar.MinWidth"
15+
android:noHistory="true"
16+
android:excludeFromRecents="true"
17+
android:launchMode="singleTask"/>
1118
</application>
1219

1320
</manifest>

ClientLib/mobile/src/main/java/com/o3dr/android/client/ServiceManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public void onServiceConnected(ComponentName name, IBinder service) {
3434
final int libVersionCode = o3drServices.getApiVersionCode();
3535
if(libVersionCode < BuildConfig.VERSION_CODE){
3636
//Prompt the user to update the 3DR Services app.
37+
o3drServices = null;
3738
promptFor3DRServicesUpdate();
3839
context.unbindService(o3drServicesConnection);
3940
}

0 commit comments

Comments
 (0)