Riot can send voice,caption via image and vedio and etc,improved UI

.gitignore

@@ -8,6 +8,7 @@
 #builds
 /build
 *.apk
+*.hprof
 
 .gradle
 /local.properties

build.gradle

@@ -54,7 +54,6 @@ allprojects {
         maven {
             url "https://github.com/vector-im/jitsi_libre_maven/raw/master/releases"
         }
-        google()
         maven {
             url "https://maven.google.com"
         }

gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

sentry.properties

@@ -0,0 +1,7 @@
++defaults.url=https://sentry.ir-cloud.ir/
+
++defaults.project=messenger
+
++defaults.org=batna
+
++auth.token=a9b6f48c8b9d4c6399f01536eaf3cf964ce15a119e0544c0b3a33409ca131d30

vector/build.gradle

@@ -31,6 +31,7 @@ ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].
 
 android {
     compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     packagingOptions {
         exclude 'META-INF/LICENSE'
@@ -44,18 +45,19 @@ android {
 
     defaultConfig {
         applicationId "im.vector"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 28
         // use the version code
-        versionCode rootProject.ext.versionCodeProp
-        versionName rootProject.ext.versionNameProp
+        versionCode 9907051
+        versionName "Mehr99-A"
 
         // Keep abiFilter for the universalApk
         ndk {
             abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64'
         }
 
         multiDexEnabled true
+        vectorDrawables.useSupportLibrary = true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -127,6 +129,7 @@ android {
             // use the version name
             versionCode rootProject.ext.versionCodeProp
             versionName rootProject.ext.versionNameProp
+            buildConfigField "boolean", "IS_SABA", "false"
             buildConfigField "boolean", "ALLOW_FCM_USE", "true"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
@@ -137,14 +140,27 @@ android {
             // use the version name
             versionCode rootProject.ext.versionCodeProp
             versionName rootProject.ext.versionNameProp
+            buildConfigField "boolean", "IS_SABA", "false"
             buildConfigField "boolean", "ALLOW_FCM_USE", "false"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }
+
+        saba {
+            applicationId "ir.batna.messaging"
+            versionCode 9905261
+            versionName "Mordad99-C"
+            buildConfigField "boolean", "IS_SABA", "true"
+            buildConfigField "boolean", "ALLOW_HOME_SERVER_CHANGE", "true"
+            buildConfigField "boolean", "ALLOW_FCM_USE", "false"
+            buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"S\""
+            buildConfigField "String", "FLAVOR_DESCRIPTION", "\"Saba\""
+        }
     }
 
     lintOptions {
         lintConfig file("lint.xml")
+        abortOnError false
     }
 
     testOptions {
@@ -176,6 +192,8 @@ static def gitBranchName() {
 }
 
 dependencies {
+    compile 'uk.co.chrisjenx:calligraphy:2.3.0'
+
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
@@ -270,6 +288,9 @@ dependencies {
 
     // appfdroid flavor only
 
+    implementation 'io.sentry:sentry-android:2.0.2'
+    implementation 'org.slf4j:slf4j-nop:1.7.25'
+
     // Test
     testImplementation 'junit:junit:4.12' // Test
     testImplementation 'androidx.test:runner:1.2.0'
@@ -296,7 +317,8 @@ configurations.all {
     }
 }
 
-if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Appfdroid")
+if (!getGradle().getStartParameter().getTaskRequests().toString().contains("fdroid")
+        && !getGradle().getStartParameter().getTaskRequests().toString().contains("Saba")
         && !getGradle().getStartParameter().getTaskRequests().toString().contains("assembleAndroidTest")) {
     apply plugin: 'com.google.gms.google-services'
 }

vector/src/main/AndroidManifest.xml

@@ -549,7 +549,7 @@
         <service
             android:name=".services.CallService"
             android:exported="false" />
-    
+
     </application>
 
 </manifest>

vector/src/main/java/im/vector/VectorApp.java

@@ -71,6 +71,7 @@
 import im.vector.notifications.NotificationDrawerManager;
 import im.vector.notifications.NotificationUtils;
 import im.vector.push.PushManager;
+import im.vector.services.EventStreamServiceX;
 import im.vector.settings.FontScale;
 import im.vector.settings.VectorLocale;
 import im.vector.tools.VectorUncaughtExceptionHandler;
@@ -193,7 +194,6 @@ public void onReceive(Context context, Intent intent) {
 
     @Override
     public void onCreate() {
-        Log.d(LOG_TAG, "onCreate");
         super.onCreate();
 
         mLifeCycleListener = new VectorLifeCycleObserver();
@@ -359,6 +359,20 @@ public void onActivityDestroyed(Activity activity) {
         PreferencesManager.fixMigrationIssues(this);
         initApplicationLocale();
         visitSessionVariables();
+        if (BuildConfig.IS_SABA) {
+            // Sentry.captureMessage("Startup");
+            try {
+                Intent serviceIntent = new Intent(this, EventStreamServiceX.class);
+                serviceIntent.setAction(EventStreamServiceX.ACTION_SIMULATED_PERMANENT_LISTENING);
+                if (Build.VERSION.SDK_INT >= 26) {
+                    startForegroundService(serviceIntent);
+                } else {
+                    startService(serviceIntent);
+                }
+            } catch (Exception e) {
+                Log.v("Error in VectorApp:", e.getMessage());
+            }
+        }
     }
 
     @Override

vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java

@@ -18,6 +18,7 @@
 package im.vector.activity;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.http.SslError;
@@ -46,6 +47,7 @@
 
 import im.vector.R;
 import im.vector.ui.themes.ThemeUtils;
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 /**
  * AccountCreationCaptchaActivity displays a webview to check captchas.
@@ -84,6 +86,11 @@ public class AccountCreationCaptchaActivity extends VectorAppCompatActivity {
             " </body> " +
             " </html> ";
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+    }
+
     @Override
     public int getLayoutRes() {
         return R.layout.activity_vector_registration_captcha;

vector/src/main/java/im/vector/activity/Calligraphy.java

@@ -0,0 +1,20 @@
+package im.vector.activity;
+
+import android.app.Application;
+
+import im.vector.R;
+import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
+
+public class Calligraphy extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
+                .setDefaultFontPath("font/shabnam.ttf")
+                .setFontAttrId(R.attr.fontPath)
+                .build()
+        );
+
+    }
+
+}

vector/src/main/java/im/vector/activity/CommonActivityUtils.java

@@ -920,7 +920,7 @@ public void run() {
      * @param outputFilename optional the output filename
      * @param callback       the asynchronous callback
      */
-    private static void saveFileInto(final File sourceFile, final String dstDirPath, final String outputFilename, final ApiCallback<String> callback) {
+    private static void saveFileInto(final File sourceFile, final String dstDirPath, final String outputFilename, final ApiCallback<String> callback, Context context) {
         // sanity check
         if ((null == sourceFile) || (null == dstDirPath)) {
             new Handler(Looper.getMainLooper()).post(new Runnable() {
@@ -958,7 +958,11 @@ protected Pair<String, Exception> doInBackground(Void... params) {
                 }
 
                 File dstDir = Environment.getExternalStoragePublicDirectory(dstDirPath);
-                if (dstDir != null) {
+                assert outputFilename != null;
+                if (outputFilename.contains(".3gp")|| outputFilename.contains(".mp3") ||outputFilename.contains(".aac")) {
+                    dstDir = new File(context.getApplicationContext().getCacheDir(), "voice");
+                }
+                    if (dstDir != null) {
                     dstDir.mkdirs();
                 }
 
@@ -1069,7 +1073,7 @@ public void onSuccess(String fullFilePath) {
 
                     try {
                         File file = new File(fullFilePath);
-                        downloadManager.addCompletedDownload(file.getName(), file.getName(), true, mimeType, file.getAbsolutePath(), file.length(), true);
+                        downloadManager.addCompletedDownload(file.getName(), file.getName(), true, mimeType, file.getAbsolutePath(), file.length(), false);
                     } catch (Exception e) {
                         Log.e(LOG_TAG, "## saveMediaIntoDownloads(): Exception Msg=" + e.getMessage(), e);
                     }
@@ -1103,7 +1107,7 @@ public void onUnexpectedError(Exception e) {
                     callback.onUnexpectedError(e);
                 }
             }
-        });
+        },context);
     }
 
     //==============================================================================================================

vector/src/main/java/im/vector/activity/CountryPickerActivity.java

@@ -38,6 +38,7 @@
 import im.vector.ui.themes.ThemeUtils;
 import im.vector.util.CountryPhoneData;
 import im.vector.util.PhoneNumberUtils;
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 public class CountryPickerActivity extends VectorAppCompatActivity implements CountryAdapter.OnSelectCountryListener, SearchView.OnQueryTextListener {
 
@@ -72,6 +73,12 @@ public static Intent getIntent(final Context context, final boolean withIndicato
      */
 
     @NotNull
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+    }
+
     @Override
     public ActivityOtherThemes getOtherThemes() {
         return ActivityOtherThemes.Picker.INSTANCE;

vector/src/main/java/im/vector/activity/JitsiCallActivity.java

@@ -116,7 +116,6 @@ public void initUiAndData() {
         setWaitingView(findViewById(R.id.jitsi_progress_layout));
 
         mWidget = (Widget) getIntent().getSerializableExtra(EXTRA_WIDGET_ID);
-        mJitsi = new JitsiWidgetProperties(mWidget.getUrl());
         mIsVideoCall = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO, true);
 
         try {

vector/src/main/java/im/vector/activity/LanguagePickerActivity.java

@@ -40,6 +40,7 @@
 import im.vector.settings.VectorLocale;
 import im.vector.ui.themes.ActivityOtherThemes;
 import im.vector.ui.themes.ThemeUtils;
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 public class LanguagePickerActivity extends VectorAppCompatActivity implements LanguagesAdapter.OnSelectLocaleListener, SearchView.OnQueryTextListener {
 
@@ -64,6 +65,12 @@ public static Intent getIntent(final Context context) {
      */
 
     @NotNull
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+    }
+
     @Override
     public ActivityOtherThemes getOtherThemes() {
         return ActivityOtherThemes.Picker.INSTANCE;

vector/src/main/java/im/vector/activity/LockScreenActivity.java

@@ -18,6 +18,7 @@
 
 package im.vector.activity;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.text.TextUtils;
@@ -48,6 +49,7 @@
 import im.vector.notifications.NotificationUtils;
 import im.vector.ui.themes.ActivityOtherThemes;
 import im.vector.util.ViewUtilKt;
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 /**
  * LockScreenActivity is displayed within the notification to send a message without opening the application.
@@ -74,6 +76,12 @@ public static boolean isDisplayingALockScreenActivity() {
     private EditText mEditText;
 
     @NotNull
+
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+    }
+
     @Override
     public ActivityOtherThemes getOtherThemes() {
         return ActivityOtherThemes.Lock.INSTANCE;

vector/src/main/java/im/vector/activity/LoggingOutActivity.java

@@ -18,12 +18,14 @@
 
 package im.vector.activity;
 
+import android.content.Context;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 
 import butterknife.BindView;
 import im.vector.R;
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 /**
  * LoggingOutActivity displays an animation while a session log out is in progress.
@@ -33,6 +35,11 @@ public class LoggingOutActivity extends MXCActionBarActivity {
     @BindView(R.id.animated_logo_image_view)
     ImageView animatedLogo;
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+    }
+
     @Override
     public int getLayoutRes() {
         return R.layout.vector_activity_splash;