Skip to content

Commit

Permalink
Merge pull request #963 from meganz/release/v3.7.0
Browse files Browse the repository at this point in the history
Release/v3.7.0
  • Loading branch information
ygaoy authored Sep 5, 2019
2 parents c9cac21 + b8ce07a commit 6fcbb57
Show file tree
Hide file tree
Showing 211 changed files with 14,258 additions and 20,888 deletions.
2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ This document will guide you to build the application on a Linux machine with An

### Build & Run the application

* Get the source code
* Get the source code.

```
git clone --recursive https://github.com/meganz/android.git
```

* Configure the variable `NDK_ROOT` to point to your Android NDK installation path at `app/src/main/jni/build.sh`.
* Install in your system the Android NDK 14 and Android NDK 16.

* Configure the variable `NDK_ROOT32` to point to your Android NDK 14 installation path and the variable `NDK_ROOT64` to point to your Android NDK 16 installation path at `app/src/main/jni/build.sh`.

* Download the link https://mega.nz/#!1wERDaYD!B66nc57HnZL6w9ArVuwOh80ZoVLprXrrSsuAE6CGfXc, uncompress it and put the folder `webrtc` in the path `app/src/main/jni/megachat/`.

* Go to `app/src/main/jni/` and execute: `./build.sh clean` and `./build.sh all`.

Expand All @@ -35,4 +39,4 @@ To use the *geolocation feature* you need a *Google Maps API key*:

* To get one, follow the directions here: https://developers.google.com/maps/documentation/android/signup.

* Once you have your key, replace the "google_maps_key" string in these files: `app/src/debug/res/values/google_maps_api.xml` and `app/src/release/res/values/google_maps_api.xml`
* Once you have your key, replace the "google_maps_key" string in these files: `app/src/debug/res/values/google_maps_api.xml` and `app/src/release/res/values/google_maps_api.xml`.
6 changes: 4 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ android {
applicationId "mega.privacy.android.app"
minSdkVersion 21
targetSdkVersion 27
versionCode 249
versionName "3.6.4 (249)"
versionCode 253
versionName "3.7.0 (253)"
multiDexEnabled true
ndk.abiFilters 'armeabi-v7a','x86', 'x86_64', 'arm64-v8a'
}

sourceSets.main {
Expand Down Expand Up @@ -58,6 +59,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:exifinterface:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.google.android.gms:play-services-wallet:16.0.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
Expand Down
18 changes: 6 additions & 12 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="mega.privacy.android.app"
android:installLocation="internalOnly"
android:versionCode="249"
android:versionName="3.6.4 (249)" >
android:installLocation="internalOnly">

<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<uses-feature android:name="android.hardware.camera" android:required="false"/>
Expand Down Expand Up @@ -36,6 +34,7 @@
<uses-permission android:name="android.permission.FLAG_SHOW_WHEN_LOCKED" />
<uses-permission android:name="android.permission.MANAGE_DOCUMENTS"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<!--<uses-permission android:name="android.permission.READ_CALL_LOG"/>-->
<!--<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>-->

Expand Down Expand Up @@ -430,11 +429,6 @@
android:launchMode="singleTop">
</activity>

<service
android:name="CameraSyncService"
android:exported="false" >
</service>

<service
android:name="mega.privacy.android.app.lollipop.megachat.ChatUploadService"
android:exported="false" >
Expand Down Expand Up @@ -485,8 +479,11 @@
<service android:name=".fcm.IncomingMessageService"/>
<service
android:name=".jobservices.CameraUploadsService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false" />
<service
android:name=".jobservices.CameraUploadStarterService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false" />
<service android:name=".fcm.IncomingCallService" android:exported="true"/>
<receiver
android:name="mega.privacy.android.app.receivers.CustomInstallReferrerReceiver"
Expand Down Expand Up @@ -522,9 +519,6 @@
<intent-filter>
<action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
</intent-filter>
</receiver>

<receiver
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/mega/privacy/android/app/BaseActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
import mega.privacy.android.app.utils.Util;
import nz.mega.sdk.MegaApiAndroid;
import nz.mega.sdk.MegaChatApiAndroid;
import nz.mega.sdk.MegaChatCall;
import nz.mega.sdk.MegaChatPresenceConfig;
import nz.mega.sdk.MegaChatRoom;

public class BaseActivity extends AppCompatActivity {
Expand Down
Loading

0 comments on commit 6fcbb57

Please sign in to comment.