Merge pull request #7 from freshbits/v2.3.1

Version 2.3.1

Author: jhabr

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.3.1 - 2020-01-31
+### Changed
+- Added manufacturer specific support
+- Minor improvements
+
 ## 2.3.0 - 2018-12-01
 ### Changed
 - Added image support to user
@@ -32,4 +37,4 @@
 
 ## 1.0.0 - 2015-12-23
 ### Added
-- Pathshare SDK for Android.
+- Pathshare SDK for Android.

README.md

@@ -23,7 +23,7 @@
 
 ## Requirements
 
-`PathshareSDK` for Android supports Android 5.x, 6.x, 7.x, 8.x and 9.x.
+`PathshareSDK` for Android supports Android 5.x, 6.x, 7.x, 8.x, 9.x and 10.x.
 
 ## Installation
 
@@ -38,7 +38,7 @@ repositories {
 
 dependencies {
     ...
-    compile 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.0'
+    compile 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.1'
 }
 ```
 

android-example-app/app-kotlin/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "ch.freshbits.pathshare.example"
         minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 2_3_0
-        versionName "2.3.0"
+        targetSdkVersion 28
+        versionCode 131
+        versionName "2.3.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -50,8 +50,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:design:27.1.1'
+    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.appcompat:appcompat:1.2.0-alpha01'
+    implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.1'
 }

android-example-app/app-kotlin/src/main/java/ch/freshbits/pathshare/example/MainActivity.kt

@@ -3,11 +3,11 @@ package ch.freshbits.pathshare.example
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.view.View
 import android.widget.Button
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import ch.freshbits.pathshare.sdk.Pathshare
 import ch.freshbits.pathshare.sdk.helper.*
 import ch.freshbits.pathshare.sdk.model.Destination

android-example-app/app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "ch.freshbits.pathshare.example"
         minSdkVersion 25
-        targetSdkVersion 27
-        versionCode 2_3_0
-        versionName "2.3.0"
+        targetSdkVersion 28
+        versionCode 131
+        versionName "2.3.1"
     }
 
     packagingOptions {
@@ -45,8 +45,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
-    //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.0'
+    testImplementation 'junit:junit:4.13'
+    implementation 'androidx.appcompat:appcompat:1.2.0-alpha01'
+    implementation 'ch.freshbits.pathshare.sdk:pathshare-sdk:2.3.1'
 }

android-example-app/app/src/main/java/ch/freshbits/pathshare/example/MainActivity.java

@@ -6,20 +6,19 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.util.Log;
-import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
 import java.net.URL;
 import java.util.Date;
 
 import ch.freshbits.pathshare.sdk.Pathshare;
 import ch.freshbits.pathshare.sdk.helper.InvitationResponseListener;
 import ch.freshbits.pathshare.sdk.helper.PermissionRequester;
 import ch.freshbits.pathshare.sdk.helper.ResponseListener;
-import ch.freshbits.pathshare.sdk.helper.SessionExpirationListener;
 import ch.freshbits.pathshare.sdk.helper.SessionResponseListener;
 import ch.freshbits.pathshare.sdk.model.Destination;
 import ch.freshbits.pathshare.sdk.model.Session;
@@ -174,13 +173,11 @@ private boolean hasLocationPermission() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        switch (requestCode) {
-            case TAG_PERMISSIONS_REQUEST_LOCATION_ACCESS: {
-                if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    performJoinSession();
-                } else {
-                    Toast.makeText(this, R.string.permission_access_fine_location_denied, Toast.LENGTH_SHORT).show();
-                }
+        if (requestCode == TAG_PERMISSIONS_REQUEST_LOCATION_ACCESS) {
+            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                performJoinSession();
+            } else {
+                Toast.makeText(this, R.string.permission_access_fine_location_denied, Toast.LENGTH_SHORT).show();
             }
         }
     }

android-example-app/build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.3.10'
 
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

android-example-app/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Dec 01 00:29:09 CET 2018
+#Fri Jan 31 15:26:07 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip