Merge pull request #20 from ccm-innovation/0.2.0-rc2

0.2.0

Author: bradbyte

.gitignore

@@ -1,2 +1,29 @@
-example/ios/Pods
-*.xcuserstate
+# ios
+Example/ios/Pods
+*.xcuserstate
+
+# android
+*.iml
+android/.gradle
+android/local.properties
+android/.idea
+android/.idea
+android/build
+android/app/build
+android/gradle
+android/captures
+
+# android example
+Example/android/.gradle
+Example/android/local.properties
+Example/android/.idea
+Example/android/.idea
+Example/android/build
+Example/android/app/build
+Example/android/gradle
+Example/android/captures
+
+Example/node_modules
+
+.DS_Store
+

CHANGELOG.md

@@ -0,0 +1,82 @@
+# Changelog
+
+## 0.2.0
+
+(Includes all features from [`0.2.0-rc2`](#020-rc2))
+
+#### Upgrading
+Update your `package.json` to use the `0.2.0` version.
+```
+npm install --save [email protected]
+```
+
+###### iOS
+Modify your `Podfile` for the Twilio dependency as follows:
+```
+pod 'TwilioIPMessagingClient', '~> 0.14.2'
+```
+
+###### Android
+Indicate to Android Studio to refresh the gradle dependencies.
+
+Or, remove the cache and it will be auto-generated on the next build.
+
+```
+rm -rf $HOME/.gradle/caches/
+```
+
+#### iOS
+- PR #19 Fixed issue with NSString token not being converted into NSData (thanks @plonkus!)
+- PR #18 Fixed negated `isSuccessful` resolves in `setAttributes` and `setFriendlyName` in client (thanks @Baisang!)
+- PR #16 Updated Podspec to match Twilios requirement of only iOS 8.1 (thanks @Baisang!)
+- Fixed misspelling of `lastConsumptionTimestamp`
+- Fixed lib Channel `getMembers` was still calling `allObjects`
+
+#### Android
+- Fixed bug when `lastConsumedMessageIndex` is null
+
+## 0.2.0-rc2
+
+#### Upgrading
+Update your `package.json` to use the `0.2.0-rc2` version.
+```
+npm install --save [email protected]
+```
+
+###### iOS
+Modify your `Podfile` for the Twilio dependency as follows:
+```
+pod 'TwilioIPMessagingClient', '~> 0.14.2'
+```
+
+###### Android
+Indicate to Android Studio to refresh the gradle dependencies.
+
+Or, remove the cache and it will be auto-generated on the next build.
+
+```
+rm -rf $HOME/.gradle/caches/
+```
+
+#### Changes (both)
+- Added `dateCreated` and `dateUpdated` to Channel
+- Added `attributes` and `setAttributes` to Message
+- Added `isReachabilityEnabeld` to Client
+- Added `isOnline` and `isNotifiable` properties to UserInfo
+- Added `onUpdate` and `close` methods to UserInfo
+- Added `lastConsumedMessageIndex` and `lastConsumptionTimestamp` to Member class
+
+#### Android
+- Updated Twilio SDK to 0.8.1
+- Updated attributes to be JSONObject instead of Maps
+- `sendMessage()` now uses a build in method instead of combing `createMessage` with `sendMessage`
+- Added `onToastFailed`, `onToastReceived`, and `onToastSubscribed` events (previously was iOS only)
+
+#### iOS
+- Updated Twilio SDK to 0.14.2
+- Added `onMemberUserInfoUpdated` event for Client and Channel
+
+#### Depreciated
+- `client.getChannelBySid(sid)` is now replaced with `client.getChannel(sid)`
+- `client.deregister(token)` is now replaced with `client.unregister(token)`
+- `onToastRegistrationFailed` Client event is now replaced with `onToastFailed`

Example/.flowconfig

@@ -15,8 +15,6 @@
 # Ignore react and fbjs where there are overlaps, but don't ignore
 # anything that react-native relies on
 .*/node_modules/fbjs/lib/Map.js
-.*/node_modules/fbjs/lib/fetch.js
-.*/node_modules/fbjs/lib/ExecutionEnvironment.js
 .*/node_modules/fbjs/lib/ErrorUtils.js
 
 # Flow has a built-in definition for the 'react' module which we prefer to use
@@ -42,6 +40,15 @@
 # Ignore Website
 .*/website/.*
 
+# Ignore generators
+.*/local-cli/generator.*
+
+# Ignore BUCK generated folders
+.*\.buckd/
+
+# Ignore RNPM
+.*/local-cli/rnpm/.*
+
 .*/node_modules/is-my-json-valid/test/.*\.json
 .*/node_modules/iconv-lite/encodings/tables/.*\.json
 .*/node_modules/y18n/test/.*\.json
@@ -59,6 +66,7 @@
 .*/node_modules/isemail/.*\.json
 .*/node_modules/tr46/.*\.json
 
+
 [include]
 
 [libs]
@@ -72,18 +80,20 @@ module.system=haste
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 
+experimental.strict_type_args=true
+
 munge_underscores=true
 
 module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\)$' -> 'RelativeImageStub'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-6]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-6]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-0.22.0
+^0.26.0

Example/.gitignore

@@ -1,7 +1,7 @@
 'use strict';
 
 import React, {
-  Component,
+  Component
 } from 'react';
 import {
   Linking,
@@ -11,8 +11,11 @@ import {
   View,
   Text,
   Navigator,
+  NativeModules,
+  NativeAppEventEmitter
 } from 'react-native';
 
+
 var GiftedMessenger = require('react-native-gifted-messenger');
 var Communications = require('react-native-communications');
 
@@ -46,8 +49,6 @@ const BOT_CONFIRMATIONS = [
   "Go for the gold!"
 ]
 
-var DeviceInfo = require('react-native-device-info')
-
 let {
   Client,
   Constants,
@@ -78,16 +79,16 @@ class GiftedMessengerContainer extends Component {
     };
 
   }
-  
+
   getToken(identity) {
-    return fetch('http://localhost:3000/token?device=iOS&identity=' + identity, {
+    return fetch('http://localhost:3000/token?device=' + Platform.OS + '&identity=' + identity, {
       method: 'get'
     })
     .then((res) => {
       return res.json()
     })
   }
-  
+
   parseMessage(message) {
     return {
       uniqueId: message.sid,
@@ -97,7 +98,7 @@ class GiftedMessengerContainer extends Component {
       date: message.timestamp
     }
   }
-  
+
   initializeMessenging(identity) {
     this.getToken(identity)
     .then(({token}) => {
@@ -109,13 +110,13 @@ class GiftedMessengerContainer extends Component {
       accessManager.onError = ({error}) => {
         console.log(error)
       }
-      
+
       var client = new Client(accessManager)
-           
+
       client.onError = ({error, userInfo}) => console.log(error)
 
       client.onClientSynchronized = () => {
-        
+
         client.getChannelByUniqueName('general')
         .then((channel) => {
           channel.initialize()
@@ -124,28 +125,30 @@ class GiftedMessengerContainer extends Component {
               channel.join()
             }
           })
-          .catch(({error}) => {
+          .catch((error) => {
             console.log(error)
           })
-          
+
           channel.onTypingStarted = (member) => {
             this.setState({typingMessage: member.userInfo.identity + ' is typing...'})
           }
-          
+
           channel.onTypingEnded = (member) => {
             this.setState({typingMessage: ''})
           }
-          
+
           channel.onMessageAdded = (message) => this.handleReceive(this.parseMessage(message))
-          
-          this.setState({client, channel})        
-        }) 
+
+          this.setState({client, channel})
+        })
       }
-      
+
+      console.log(Constants)
+
       client.initialize()
     })
   }
-  
+
   botMessage(message, time = 1000) {
     this.setState({typingMessage: 'MessagingBot is typing...'})
     return new Promise((resolve, reject) => {
@@ -158,7 +161,7 @@ class GiftedMessengerContainer extends Component {
           position: 'left',
           internal: true
         })
-        resolve() 
+        resolve()
       },time)
     })
   }
@@ -168,6 +171,7 @@ class GiftedMessengerContainer extends Component {
         this.botMessage(BOT_GREETINGS[Math.floor(Math.random()*BOT_GREETINGS.length)])
         .then(() => this.botMessage(BOT_QUESTIONS[Math.floor(Math.random()*BOT_QUESTIONS.length)], 2000))
       },500)
+      var test = NativeAppEventEmitter.addListener("bradtest", (test) => console.log(test));
   }
 
   componentWillUnmount() {
@@ -210,18 +214,18 @@ class GiftedMessengerContainer extends Component {
   handleSend(message = {}) {
     // Your logic here
     // Send message.text to your server
-    
+
     if (this.state.client) {
       this.state.channel.sendMessage(message.text)
       .catch((error) => console.error(error))
     } else {
       this.initializeMessenging(message.text)
       message.uniqueId = Math.round(Math.random() * 10000); // simulating server-side unique id generation
-      this.setMessages(this._messages.concat(message));  
+      this.setMessages(this._messages.concat(message));
       this.botMessage("Hello " + message.text + "!", 1000)
       .then(() => this.botMessage(BOT_CONFIRMATIONS[Math.floor(Math.random()*BOT_CONFIRMATIONS.length)], 2000))
     }
-    
+
     // message.uniqueId = Math.round(Math.random() * 10000); // simulating server-side unique id generation
     // this.setMessages(this._messages.concat(message));
 
@@ -319,7 +323,7 @@ class GiftedMessengerContainer extends Component {
         senderImage={null}
         onImagePress={this.onImagePress}
         displayNames={true}
-        
+
         onChangeText={() => this.state.channel ? this.state.channel.typing() : false}
 
         parseText={true} // enable handlePhonePress, handleUrlPress and handleEmailPress

Example/GiftedMessengerContainer.js

@@ -1,6 +1,6 @@
 # Example App
 
-Run `npm install` and then `pod install` to bring in the xcode dependencies. 
+Run `npm install` (in this directory) and then `pod install` (for iOS) to bring in the xcode dependencies. 
 
 This is an example app using [React Native Gifted Messenger](https://github.com/FaridSafi/react-native-gifted-messenger).