Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55657b1c authored by Ray's avatar Ray
Browse files

Merged branch master into master

parents b5ec6bb3 b0ee6ddf

.travis.yml

+1 −0
Original line number Diff line number Diff line 
language: android

sudo: false



android:

  components:

QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java

+0 −10
Original line number Diff line number Diff line 
package com.moez.QKSMS.common.utils;



import android.content.SharedPreferences;

import android.preference.PreferenceManager;

import android.test.AndroidTestCase;

import com.moez.QKSMS.ui.settings.SettingsFragment;



import java.text.SimpleDateFormat;
@@ -12,13 +9,6 @@ public class DateFormatterTest extends AndroidTestCase { 
        super.setUp();

    }



    public void test24Hours() {

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());

        prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).apply();

        assertTrue(DateFormatter.accountFor24HourTime(getContext(), new SimpleDateFormat("h:mm a")).equals(new SimpleDateFormat("H:mm")));

        prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).apply();

    }



    public void testDateSymbolsAPI(){

        assertEquals(new SimpleDateFormat("H:mm a").toPattern(), "H:mm a");

    }

QKSMS/src/main/AndroidManifest.xml

+10 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
            android:icon="@mipmap/ic_launcher_teal"

            android:label="@string/app_name"

            android:logo="@color/transparent"

            android:screenOrientation="user"

            android:windowSoftInputMode="adjustResize">

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />
@@ -92,16 +93,20 @@ 
        <activity

            android:name=".ui.messagelist.MessageListActivity"

            android:launchMode="singleTop"

            android:screenOrientation="user"

            android:windowSoftInputMode="adjustResize" />



        <activity

            android:name=".ui.settings.SettingsActivity"

            android:screenOrientation="user"

            android:windowSoftInputMode="adjustResize" />

        <activity

            android:name=".ui.search.SearchActivity"

            android:screenOrientation="user"

            android:windowSoftInputMode="adjustResize" />

        <activity

            android:name=".ui.compose.ComposeActivity"

            android:screenOrientation="user"

            android:windowSoftInputMode="adjustResize" />



        <activity-alias
@@ -335,17 +340,21 @@ 


        <activity

            android:name=".ui.welcome.WelcomeActivity"

            android:screenOrientation="portrait"

            android:theme="@style/AppThemeLight" />



        <!-- Popup activity -->

        <activity

            android:name=".ui.popup.QKReplyActivity"

            android:excludeFromRecents="true"

            android:screenOrientation="user"

            android:taskAffinity=""

            android:theme="@style/AppThemeLightDialog"

            android:windowSoftInputMode="adjustResize" />



        <activity android:name=".ui.mms.SlideshowActivity" />

        <activity

            android:name=".ui.mms.SlideshowActivity"

            android:screenOrientation="user" />



        <receiver

            android:name=".receiver.RemoteMessagingReceiver"

QKSMS/src/main/java/android/net/DhcpInfoInternal.java

+3 −3
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import java.util.Collections; 
 * @hide

 */

public class DhcpInfoInternal {

    private final static String TAG = "DhcpInfoInternal";

    private static final String TAG = "DhcpInfoInternal";



    private final static boolean LOCAL_LOGV = false;

    private static final boolean LOCAL_LOGV = false;

    public String ipAddress;

    public int prefixLength;
@@ -140,7 +140,7 @@ public class DhcpInfoInternal { 
            dns2 = orig.dns2;

        }



        if (mRoutes.size() == 0) {

        if (mRoutes.isEmpty()) {

            for (RouteInfo route : orig.getRoutes()) {

                addRoute(route);

            }

QKSMS/src/main/java/android/net/IConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ public interface IConnectivityManager extends android.os.IInterface { 
    /**

     * Local-side IPC implementation stub class.

     */

    public static abstract class Stub extends android.os.Binder implements android.net.IConnectivityManager {

    public abstract static class Stub extends android.os.Binder implements android.net.IConnectivityManager {

        private static final String DESCRIPTOR = "android.net.IConnectivityManager";



        /**