react-native-flic2 0.3.21 → 0.3.23

package/README.md

@@ -20,6 +20,7 @@ This plugin is supported by the Flic2 SDKs
 import Flic2 from 'react-native-flic2';
 
 // Flic2 Module
+Flic.start();                            // Starts the module, fixes auto bluetooth permission question
 Flic2.isInitialized();                   // returns a boolean if the manager is initialized or not
 Flic2.startScan();                       // start a scan
 Flic2.stopScan();                        // stop a scan
@@ -182,6 +183,9 @@ export default class App extends Component {
 
   componentDidMount() {
 
+    // start module
+    Flic2.start();
+
     if (typeof Flic2.isInitialized === 'function' && Flic2.isInitialized() === true) {
       this.onInitialized();
     } else {

package/android/.project

@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1659599870811</id>
+			<id>1672997242985</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,4 +1,4 @@
-arguments=
+arguments=--init-script /var/folders/6m/z8r_cr313y9_r9ylszfy4tnm0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/6m/z8r_cr313y9_r9ylszfy4tnm0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

package/android/build.gradle

@@ -35,6 +35,7 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
@@ -68,7 +69,7 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.github.50ButtonsEach:flic2lib-android:1.1.0'
+    implementation 'com.github.50ButtonsEach:flic2lib-android:1.3.1'
 
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.13'
@@ -108,7 +109,8 @@ afterEvaluate { project ->
     task androidJavadoc(type: Javadoc) {
         source = android.sourceSets.main.java.srcDirs
         classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
+        project.getConfigurations().getByName('implementation').setCanBeResolved(true)
+        classpath += files(project.getConfigurations().getByName('implementation').asList())
         include '**/*.java'
     }
 
@@ -137,12 +139,11 @@ afterEvaluate { project ->
         archives androidJavadocJar
     }
 
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
+   publishing {
+        repositories {
+            maven {
+                url = uri("${rootProject.projectDir}/maven-repo")
+            }
         }
-    }
+   }
 }

package/android/src/main/java/nl/xguard/flic2/Flic2.java

@@ -82,7 +82,11 @@ public class Flic2 extends ReactContextBaseJavaModule implements LifecycleEventL
         boolean isRunning = isServiceRunning(context, Flic2Service.class);
         if (!isRunning) {
             Intent intent = new Intent(context, Flic2Service.class);
-            startForegroundService(context, intent);
+            try {
+                startForegroundService(context, intent);
+            } catch (Exception e) {
+            Log.d(TAG, "startService() exception " + e);
+            }
         }
     }
 
@@ -177,8 +181,12 @@ public class Flic2 extends ReactContextBaseJavaModule implements LifecycleEventL
         Context context = getReactApplicationContext();
         boolean isRunning = isServiceRunning(context, Flic2Service.class);
         if (isRunning) {
-            Intent intent = new Intent(context, Flic2Service.class);
-            getReactApplicationContext().bindService(intent, mFlic2ServiceConnection, BIND_AUTO_CREATE);
+            try {
+                Intent intent = new Intent(context, Flic2Service.class);
+                getReactApplicationContext().bindService(intent, mFlic2ServiceConnection, BIND_AUTO_CREATE);
+              } catch ( Exception e) {
+                Log.w(TAG, "onHostResume(), Exception ", e);
+              }
         }
     }
 
@@ -191,7 +199,7 @@ public class Flic2 extends ReactContextBaseJavaModule implements LifecycleEventL
                 context.unbindService(mFlic2ServiceConnection);
             }
         } catch (Exception e) {
-            Log.w(TAG, "onHostPause() , unbindService", e);
+            Log.w(TAG, "onHostPause() , Exception", e);
         }
     }
 

package/android/src/main/java/nl/xguard/flic2/service/Flic2Service.java

@@ -95,7 +95,7 @@ public class Flic2Service extends Service implements IFlic2Service {
       setFlic2Init();
 
       Intent notificationIntent = new Intent(this, Flic2Service.class);
-      PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);
+      PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
       if (VERSION.SDK_INT >= VERSION_CODES.O) {
         NotificationChannel mChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_LOW);
@@ -180,7 +180,11 @@ public class Flic2Service extends Service implements IFlic2Service {
     public void startForegroundService() {
       if (isServiceStarted == false && notification != null) {
         this.isServiceStarted = true;
-        startForeground(SERVICE_NOTIFICATION_ID, notification);
+        try {
+          startForeground(SERVICE_NOTIFICATION_ID, notification);
+        } catch (Exception e) {
+          Log.w(TAG, "startForegroundService() exception ", e);
+        }
       }
     }
 

package/index.js

@@ -104,12 +104,18 @@ class Flic2 extends EventEmitter {
 
 	  this.registerInitializedCallback();
 	
-	  // start the native context
-    Flic2Module.startup();
 
     // known buttons
     this.knownButtons = {};
   }
+
+    /**
+   * Start up the flic module
+   */
+    start() {
+      // start the native context
+      Flic2Module.startup();
+    }
   
   registerInitializedCallback(){
     if(Platform.OS === 'android') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-flic2",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "React Native Flic plugin made with the Flic2 SDK (unofficial)",
   "main": "index.js",
   "scripts": {},