Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-09 09:44:17 +01:00
commit ec40fa4715
2 changed files with 2 additions and 4 deletions

View file

@ -14,12 +14,10 @@
<activity <activity
android:name="net.osmand.skimaps.SkiMapsActivity" android:name="net.osmand.skimaps.SkiMapsActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
<!--
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
-->
</activity> </activity>
</application> </application>

View file

@ -2,7 +2,7 @@ package net.osmand.skimaps;
import net.osmand.skimapsPlugin.R; import net.osmand.skimapsPlugin.R;
import android.app.Activity; import android.app.Activity;
import android.support.v7.app.AlertDialog; import android.app.AlertDialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -44,7 +44,7 @@ public class SkiMapsActivity extends Activity {
builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() { builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS)); Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT));
try { try {
stopService(intent); stopService(intent);
startActivity(intent); startActivity(intent);