Commit c6b08eaa authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Fix command line build lint warnings

parent 62860981

app/build.gradle

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ android { 
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }



    lintOptions {

        disable 'GoogleAppIndexingWarning'

    }

}



dependencies {

app/src/main/java/net/fabiszewski/ulogger/MainActivity.java

+12 −4
Original line number Diff line number Diff line
@@ -322,16 +322,24 @@ public class MainActivity extends AppCompatActivity { 
        final String server_link = getString(R.string.ulogger_server_link, getString(R.string.ulogger_server));

        final String app_link = getString(R.string.app_link, getString(R.string.homepage, getString(R.string.app_name)));

        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {

            //noinspection deprecation

            descriptionLabel.setText(Html.fromHtml(getString(R.string.about_description, server_link)));

            //noinspection deprecation

            description2Label.setText(Html.fromHtml(getString(R.string.about_description2, app_link)));

            descriptionLabel.setText(fromHtmlDepreciated(getString(R.string.about_description, server_link)));

            description2Label.setText(fromHtmlDepreciated(getString(R.string.about_description2, app_link)));

        } else {

            descriptionLabel.setText(Html.fromHtml(getString(R.string.about_description, server_link), android.text.Html.FROM_HTML_MODE_LEGACY));

            description2Label.setText(Html.fromHtml(getString(R.string.about_description2, app_link), android.text.Html.FROM_HTML_MODE_LEGACY));

        }

    }



    /**

     * Depreciated fromHtml method for build version < 24

     * @param text Message text

     * @return Text with parsed html

     */

    @SuppressWarnings("deprecation")

    private static CharSequence fromHtmlDepreciated(String text) {

        return Html.fromHtml(text);

    }



    /**

     * Display warning before deleting not synchronized track

     */

build.gradle

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ buildscript { 
}



allprojects {

    tasks.withType(JavaCompile) {

        options.compilerArgs << "-Xlint:deprecation"

    }

    repositories {

        jcenter()

    }