Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9998 from osmandapp/issues_201_opr_show_image

Browse source 
Issues 201 opr show image added icon
This commit is contained in:
vshcherb 2020-10-09 16:54:13 +02:00 committed by GitHub
commit b64fbab821
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/cards/IPFSImageCard.java
View file

@ -1,8 +1,10 @@
package net.osmand.plus.mapcontextmenu.builders.cards; package net.osmand.plus.mapcontextmenu.builders.cards;
import android.view.View; import android.view.View;
import androidx.core.content.ContextCompat;
import net.osmand.AndroidNetworkUtils; import net.osmand.AndroidNetworkUtils;
import net.osmand.PlatformUtil; import net.osmand.PlatformUtil;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -24,6 +26,7 @@ public class IPFSImageCard extends ImageCard {
url = BASE_URL + cid; url = BASE_URL + cid;
imageHiresUrl = BASE_URL + cid; imageHiresUrl = BASE_URL + cid;
imageUrl = BASE_URL + cid; imageUrl = BASE_URL + cid;
icon = ContextCompat.getDrawable(getMyApplication(), R.drawable.ic_logo_openplacereview);
if (!Algorithms.isEmpty(getUrl())) { if (!Algorithms.isEmpty(getUrl())) {
View.OnClickListener onClickListener = new View.OnClickListener() { View.OnClickListener onClickListener = new View.OnClickListener() {
@Override @Override

1
OsmAnd/src/net/osmand/plus/osmedit/SettingsOsmEditingActivity.java
View file

@ -179,7 +179,6 @@ public class SettingsOsmEditingActivity extends SettingsBaseActivity {
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);
Uri uri = intent.getData(); Uri uri = intent.getData();
System.out.println("URI=" + uri);
if (uri != null && uri.toString().startsWith("osmand-oauth")) { if (uri != null && uri.toString().startsWith("osmand-oauth")) {
String oauthVerifier = uri.getQueryParameter("oauth_verifier"); String oauthVerifier = uri.getQueryParameter("oauth_verifier");
client.authorize(oauthVerifier); client.authorize(oauthVerifier);