Skip to content

Commit 1ff75dc

Browse files
authored
Merge pull request #362 from Horizontal-org/develop
release 2.15.0(198)
2 parents 817edb8 + c832357 commit 1ff75dc

File tree

112 files changed

+3183
-3941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+3183
-3941
lines changed

mobile/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
minSdkVersion versions.minSdk
1515
compileSdkVersion versions.compileSdk
1616
targetSdkVersion versions.targetSdk
17-
versionCode 196
18-
versionName "2.14.0"
17+
versionCode 198
18+
versionName "2.15.0"
1919
multiDexEnabled true
2020

2121
ndk {
@@ -29,7 +29,7 @@ android {
2929
String dropboxKey = localProperties['DROPBOX_APP_KEY']
3030
if (dropboxKey == null) {
3131
logger.warn("No value provided for DROPBOX_APP_KEY. Specify a value in a examples/android/local.properties file. You can register for one at https://developers.dropbox.com/")
32-
dropboxKey = "PUT_YOUR_KEY_HERE"
32+
dropboxKey = ""
3333
}
3434
buildConfigField "String", "DROPBOX_APP_KEY", "\"${dropboxKey}\""
3535
manifestPlaceholders = [dropboxKey: dropboxKey]

mobile/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
9292
android:exported="true"
9393
android:icon="@mipmap/tella_icon_round"
94-
android:label="@string/app_name"
9594
android:theme="@style/AppTheme.NoActionBar">
9695
<intent-filter>
9796
<action android:name="android.intent.action.MAIN" />
@@ -503,7 +502,6 @@
503502
<activity
504503
android:name=".views.activity.MainActivity"
505504
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
506-
android:label="@string/app_name"
507505
android:theme="@style/AppTheme.NoActionBar" />
508506
<activity
509507
android:name=".views.activity.SettingsActivity"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.horizontal.tella.mobile.bus.event;
2+
3+
import com.hzontal.tella_vault.VaultFile;
4+
5+
public class AudioRecordEvent {
6+
7+
private VaultFile vaultFile;
8+
9+
public AudioRecordEvent(VaultFile vaultFile) {
10+
this.vaultFile = vaultFile;
11+
}
12+
13+
public VaultFile getVaultFile() {
14+
return vaultFile;
15+
}
16+
}
17+

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/IAudioCapturePresenterContract.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/IAudioPlayPresenterContract.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/ICameraPresenterContract.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/ICheckOdkServerContract.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/ICheckUwaziServer.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/ICheckUwaziServerContract.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

mobile/src/main/java/org/horizontal/tella/mobile/mvp/contract/ICollectBlankFormListRefreshPresenterContract.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)