Merge pull request #499 from PhenoApps/develop

v5.3
PhenoApps · Sep 7, 2022 · da3f860 · da3f860
2 parents 80bb408 + 649df6a
commit da3f860
Show file tree

Hide file tree

Showing 115 changed files with 5,039 additions and 1,802 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at trife@ksu.edu. All
+reported by contacting the project team at twrife@clemson.edu. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.fieldbook.tracker"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode = 525
-        versionName = '5.2.5'
+        versionCode = 530
+        versionName = '5.3.0'
         multiDexEnabled true
     }
 
@@ -83,7 +83,7 @@ dependencies {
     //zebra dependency
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.6.0-alpha04'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
@@ -101,7 +101,14 @@ dependencies {
 
     implementation 'com.google.zxing:core:3.3.3'
 
-    implementation('com.github.phenoapps:phenolib:v0.9.37')
+
+    implementation('com.github.phenoapps:phenolib:v0.9.39')
+
+    //necessary when building phenolib locally
+    //implementation "com.squareup.okhttp:okhttp:2.7.5"
+
+    //uvc camera java native libs
+    implementation("com.serenegiant:common:2.12.4")
 
     implementation 'com.github.breeding-insight:brapi:2.0.3'
     implementation("com.squareup.okhttp3:okhttp:4.9.3")

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
 
     <!-- this tools:replace is required for tableview -->
     <application
-        android:name="androidx.multidex.MultiDexApplication"
+        android:name=".application.FieldBook"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/field_book"
@@ -176,6 +176,9 @@
         <activity android:name=".activities.DefineStorageActivity"
             android:theme="@style/AppTheme"/>
 
+        <activity android:name=".activities.LocaleChoiceActivity"
+            android:theme="@style/AppTheme"/>
+
         <provider
             android:name=".provider.GenericFileProvider"
             android:authorities="com.fieldbook.tracker.fileprovider"

diff --git a/app/src/main/java/com/fieldbook/tracker/activities/BrapiAuthActivity.java b/app/src/main/java/com/fieldbook/tracker/activities/BrapiAuthActivity.java
@@ -118,6 +118,7 @@ public void authorizeBrAPI(SharedPreferences sharedPreferences, Context context)
             Uri oidcConfigURI = Uri.parse(sharedPreferences.getString(GeneralKeys.BRAPI_OIDC_URL, ""));
 
             ConnectionBuilder builder = uri -> {
+
                 Preconditions.checkNotNull(uri, "url must not be null");
                 Preconditions.checkArgument(HTTP.equals(uri.getScheme()) || HTTPS.equals(uri.getScheme()),
                         "scheme or uri must be http or https");

diff --git a/app/src/main/java/com/fieldbook/tracker/activities/BrapiExportActivity.java b/app/src/main/java/com/fieldbook/tracker/activities/BrapiExportActivity.java
@@ -18,9 +18,6 @@
 
 import com.fieldbook.tracker.R;
 import com.fieldbook.tracker.brapi.ApiErrorCode;
-import com.fieldbook.tracker.brapi.service.AbstractBrAPIService;
-import com.fieldbook.tracker.brapi.service.BrAPIService;
-import com.fieldbook.tracker.brapi.service.BrAPIServiceFactory;
 import com.fieldbook.tracker.brapi.BrapiControllerResponse;
 import com.fieldbook.tracker.brapi.model.FieldBookImage;
 import com.fieldbook.tracker.brapi.model.Observation;
@@ -35,7 +32,6 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
-import java.util.concurrent.Semaphore;
 
 public class BrapiExportActivity extends AppCompatActivity {
     private static final String TAG = BrapiExportActivity.class.getName();
@@ -231,13 +227,13 @@ private void sendData() {
 
     private void loadNewImages() {
         for (FieldBookImage image : imagesNew) {
-            image.loadImage();
+            image.loadImage(this);
         }
     }
 
     private void loadEditedIncompleteImages() {
         for (FieldBookImage image : imagesEditedIncomplete) {
-            image.loadImage();
+            image.loadImage(this);
         }
     }
 
@@ -684,11 +680,11 @@ private void loadStatistics() {
         List<Observation> userCreatedTraitObservations = dataHelper.getUserTraitObservations();
         List<Observation> wrongSourceObservations = dataHelper.getWrongSourceObservations(hostURL);
 
-        List<FieldBookImage> images = dataHelper.getImageObservations(hostURL);
+        List<FieldBookImage> images = dataHelper.getImageObservations(this, hostURL);
         imagesNew.clear();
         imagesEditedIncomplete.clear();
-        List<FieldBookImage> userCreatedTraitImages = dataHelper.getUserTraitImageObservations();
-        List<FieldBookImage> wrongSourceImages = dataHelper.getWrongSourceImageObservations(hostURL);
+        List<FieldBookImage> userCreatedTraitImages = dataHelper.getUserTraitImageObservations(this);
+        List<FieldBookImage> wrongSourceImages = dataHelper.getWrongSourceImageObservations(this, hostURL);
 
         for (Observation observation : observations) {
             switch (observation.getStatus()) {