Skip to content

Commit

Permalink
Fix lint; Bump Version to 0.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
rubengees committed Jan 3, 2016
1 parent 3dd947b commit 5aa41b9
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 11 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "com.proxerme.app"
minSdkVersion 15
targetSdkVersion 23
versionCode 14
versionName "0.2.5"
versionCode 15
versionName "0.2.6"
}
buildTypes {
release {
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@
android:value=".activity.DashboardActivity" />
</activity>

<service
android:name=".customtabs.KeepAliveService"
android:exported="true" />
<service android:name=".customtabs.KeepAliveService" />
<service
android:name=".service.NotificationService"
android:exported="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class CustomTabActivityHelper implements ServiceConnectionCallback {
private ConnectionCallback mConnectionCallback;

/**
* Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView.
* Opens the URL on a Custom Tab if possible. Otherwise fallback to opening it on a WebView.
*
* @param activity The host activity.
* @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available.
Expand All @@ -47,7 +47,7 @@ public static void openCustomTab(Activity activity,
CustomTabFallback fallback) {
String packageName = CustomTabsHelper.getPackageNameToUse(activity);

//If we cant find a package name, it means theres no browser that supports
//If we cant find a package name, it means there is no browser that supports
//Chrome Custom Tabs installed. So, we fallback to the webview
if (packageName == null) {
if (fallback != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private static String generateNewsNotificationBigText(@NonNull List<News> news,
*
* @param context The context.
* @param conferences The new messages. It is expected, that only new conferences are passes,
* as no checks will hapen here.
* as no checks will happen here.
*/
public static void showMessagesNotification(@NonNull Context context,
@NonNull List<Conference> conferences) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_news_image_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".activity.NewsImageDetailActivity">
tools:context=".activity.ImageDetailActivity">

<ImageView
android:id="@+id/activity_news_image_detail_image"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<string name="app_name">ProxerMe</string>
<string name="about_description">Entwickler: Ruben Gees</string>
<string name="drawer_item_donate">Spenden</string>
<string name="drawer_item_info">Info</string>
<string name="drawer_item_news">News</string>
<string name="drawer_item_settings">Einstellungen</string>
<string name="error_io">Es gabe ein Problem mit dem Speicher. Bitte versuche es erneut.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<string name="app_name">ProxerMe</string>

<string name="drawer_item_news">News</string>
<string name="drawer_item_info">Info</string>
<string name="drawer_item_donate">Donate</string>
<string name="drawer_item_settings">Settings</string>
<string name="about_description">Developer: Ruben Gees</string>
Expand Down

0 comments on commit 5aa41b9

Please sign in to comment.