Update gradle and targetSdkVersion

.circleci/config.yml

@@ -119,6 +119,7 @@ jobs:
             cd android
 
             echo -e "" > ./gradle.properties
+            echo -e "android.enableAapt2=false" >> ./gradle.properties
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE

__tests__/__snapshots__/RoomItem.js.snap

@@ -585,7 +585,7 @@ exports[`render unread +999 1`] = `
             source={
               Object {
                 "priority": "high",
-                "uri": "/avatar/name?random=0",
+                "uri": "/avatar/name",
               }
             }
             style={
@@ -835,7 +835,7 @@ exports[`render unread 1`] = `
             source={
               Object {
                 "priority": "high",
-                "uri": "/avatar/name?random=0",
+                "uri": "/avatar/name",
               }
             }
             style={
@@ -1085,7 +1085,7 @@ exports[`renders correctly 1`] = `
             source={
               Object {
                 "priority": "high",
-                "uri": "/avatar/name?random=0",
+                "uri": "/avatar/name",
               }
             }
             style={

__tests__/__snapshots__/Storyshots.test.js.snap

@@ -62,7 +62,7 @@ exports[`Storyshots Avatar avatar 1`] = `
           source={
             Object {
               "priority": "high",
-              "uri": "/avatar/test?random=0",
+              "uri": "/avatar/test",
             }
           }
           style={
@@ -136,7 +136,7 @@ exports[`Storyshots Avatar avatar 1`] = `
           source={
             Object {
               "priority": "high",
-              "uri": "/avatar/aa?random=0",
+              "uri": "/avatar/aa",
             }
           }
           style={
@@ -210,7 +210,7 @@ exports[`Storyshots Avatar avatar 1`] = `
           source={
             Object {
               "priority": "high",
-              "uri": "/avatar/bb?random=0",
+              "uri": "/avatar/bb",
             }
           }
           style={
@@ -284,7 +284,7 @@ exports[`Storyshots Avatar avatar 1`] = `
           source={
             Object {
               "priority": "high",
-              "uri": "/avatar/test?random=0",
+              "uri": "/avatar/test",
             }
           }
           style={
@@ -393,7 +393,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/rocket.cat?random=0",
+                  "uri": "/avatar/rocket.cat",
                 }
               }
               style={
@@ -615,7 +615,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/rocket.cat?random=0",
+                  "uri": "/avatar/rocket.cat",
                 }
               }
               style={
@@ -841,7 +841,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/rocket.cat?random=0",
+                  "uri": "/avatar/rocket.cat",
                 }
               }
               style={
@@ -1086,7 +1086,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries?random=0",
+                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries",
                 }
               }
               style={
@@ -1335,7 +1335,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries?random=0",
+                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries",
                 }
               }
               style={
@@ -1580,7 +1580,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries?random=0",
+                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries",
                 }
               }
               style={
@@ -1825,7 +1825,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries?random=0",
+                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries",
                 }
               }
               style={
@@ -2070,7 +2070,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries?random=0",
+                  "uri": "/avatar/Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries",
                 }
               }
               style={
@@ -2315,7 +2315,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/W?random=0",
+                  "uri": "/avatar/W",
                 }
               }
               style={
@@ -2537,7 +2537,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/WW?random=0",
+                  "uri": "/avatar/WW",
                 }
               }
               style={
@@ -2759,7 +2759,7 @@ exports[`Storyshots Channel Cell Direct Messages 1`] = `
               source={
                 Object {
                   "priority": "high",
-                  "uri": "/avatar/?random=0",
+                  "uri": "/avatar/",
                 }
               }
               style={

android/app/build.gradle

@@ -91,12 +91,12 @@ def enableProguardInReleaseBuilds = false
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.1"
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "chat.rocket.reactnative"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 27
         versionCode VERSIONCODE as Integer
         versionName "1"
         ndk {

android/build.gradle

@@ -3,9 +3,11 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        // classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,6 +18,7 @@ allprojects {
     repositories {
         mavenLocal()
         jcenter()
+        google()
         maven {
             url 'https://maven.google.com'
         }

android/gradle.properties

@@ -16,5 +16,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+android.enableAapt2=false
 android.useDeprecatedNdk=true
 VERSIONCODE=999999999

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+# distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

app/containers/Avatar.js

@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 import { StyleSheet, Text, View, ViewPropTypes } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import avatarInitialsAndColor from '../utils/avatarInitialsAndColor';
-import database from '../lib/realm';
 
 const styles = StyleSheet.create({
 	iconContainer: {
@@ -42,59 +41,60 @@ export default class Avatar extends React.PureComponent {
 		borderRadius: 2,
 		forceInitials: false
 	};
-	state = { showInitials: true, user: {} };
+	state = { showInitials: true };
 
-	componentDidMount() {
-		const { text, type } = this.props;
-		if (type === 'd') {
-			this.users = this.userQuery(text);
-			this.users.addListener(this.update);
-			this.update();
-		}
-	}
+	// componentDidMount() {
+	// 	const { text, type } = this.props;
+	// 	if (type === 'd') {
+	// 		this.users = this.userQuery(text);
+	// 		this.users.addListener(this.update);
+	// 		this.update();
+	// 	}
+	// }
 
-	componentWillReceiveProps(nextProps) {
-		if (nextProps.text !== this.props.text && nextProps.type === 'd') {
-			if (this.users) {
-				this.users.removeAllListeners();
-			}
-			this.users = this.userQuery(nextProps.text);
-			this.users.addListener(this.update);
-			this.update();
-		}
-	}
+	// componentWillReceiveProps(nextProps) {
+	// 	if (nextProps.text !== this.props.text && nextProps.type === 'd') {
+	// 		if (this.users) {
+	// 			this.users.removeAllListeners();
+	// 		}
+	// 		this.users = this.userQuery(nextProps.text);
+	// 		this.users.addListener(this.update);
+	// 		this.update();
+	// 	}
+	// }
 
-	componentWillUnmount() {
-		if (this.users) {
-			this.users.removeAllListeners();
-		}
-	}
+	// componentWillUnmount() {
+	// 	if (this.users) {
+	// 		this.users.removeAllListeners();
+	// 	}
+	// }
 
-	get avatarVersion() {
-		return (this.state.user && this.state.user.avatarVersion) || 0;
-	}
+	// get avatarVersion() {
+	// 	// return (this.state.user && this.state.user.avatarVersion) || 0;
+	// 	return 0;
+	// }
 
 	/** FIXME: Workaround
 	 * While we don't have containers/components structure, this is breaking tests.
 	 * In that case, avatar would be a component, it would receive an `avatarVersion` param
 	 * and we would have a avatar container in charge of making queries.
 	 * Also, it would make possible to write unit tests like these.
 	*/
-	userQuery = (username) => {
-		if (database && database.databases && database.databases.activeDB) {
-			return database.objects('users').filtered('username = $0', username);
-		}
-		return {
-			addListener: () => {},
-			removeAllListeners: () => {}
-		};
-	}
+	// userQuery = (username) => {
+	// 	if (database && database.databases && database.databases.activeDB) {
+	// 		return database.objects('users').filtered('username = $0', username);
+	// 	}
+	// 	return {
+	// 		addListener: () => {},
+	// 		removeAllListeners: () => {}
+	// 	};
+	// }
 
-	update = () => {
-		if (this.users.length) {
-			this.setState({ user: this.users[0] });
-		}
-	}
+	// update = () => {
+	// 	if (this.users.length) {
+	// 		this.setState({ user: this.users[0] });
+	// 	}
+	// }
 
 	render() {
 		const {
@@ -123,7 +123,7 @@ export default class Avatar extends React.PureComponent {
 		let image;
 
 		if (type === 'd' && !forceInitials) {
-			const uri = avatar || `${ baseUrl }/avatar/${ text }?random=${ this.avatarVersion }`;
+			const uri = avatar || `${ baseUrl }/avatar/${ text }`;
 			image = uri ? (
 				<FastImage
 					style={[styles.avatar, avatarStyle]}

app/containers/Routes.js

@@ -58,7 +58,7 @@ export default class Routes extends React.Component {
 	}
 
 	componentWillUnmount() {
-		Linking.removeAllListeners();
+		Linking.removeEventListener('url', this.handleOpenURL);
 	}
 
 	handleOpenURL({ url }) {

app/lib/ddp.js

@@ -206,11 +206,13 @@ export default class Socket extends EventEmitter {
 			}, 5000);
 			this.connection = new WebSocket(`${ this.url }/websocket`, null);
 
-			this.connection.onopen = () => {
+			this.connection.onopen = async() => {
 				this.emit('open');
 				resolve();
 				this.ddp.emit('open');
-				return this._login && this.login(this._login);
+				if (this._login) {
+					return this.login(this._login).catch(e => console.warn(e));
+				}
 			};
 			this.connection.onclose = debounce((e) => {
 				this.emit('disconnected', e);
@@ -260,6 +262,9 @@ export default class Socket extends EventEmitter {
 			msg: 'method', method, params
 		}).then(data => data.result || data.subs).catch((err) => {
 			log('DDP call Error', err);
+			if (err && /you've been logged out by the server/i.test(err.reason)) {
+				return this.emit('forbidden');
+			}
 			return Promise.reject(err);
 		});
 	}