drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-27 08:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Drop OSM OAuth1 login

Browse Source 
Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-08-19 18:29:10 +02:00
committed by Konstantin Pastbin
parent c30990ecda
commit dddbfa315d
51 changed files with 0 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
android/app/src/main/java/app/organicmaps/MwmActivity.java
View File

@@ -18,7 +18,6 @@ import android.app.Activity;
import android.app.Dialog;
import android.app.PendingIntent;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.ColorStateList;
import android.content.res.Configuration;
@@ -28,7 +27,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
@@ -66,7 +64,6 @@ import app.organicmaps.downloader.OnmapDownloader;
import app.organicmaps.editor.EditorActivity;
import app.organicmaps.editor.EditorHostFragment;
import app.organicmaps.editor.FeatureCategoryActivity;
import app.organicmaps.editor.OsmLoginActivity;
import app.organicmaps.editor.ReportFragment;
import app.organicmaps.help.HelpActivity;
import app.organicmaps.intent.Factory;
@@ -99,7 +96,6 @@ import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.downloader.UpdateInfo;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.location.LocationState;
@@ -290,7 +286,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
processIntent();
migrateOAuthCredentials();
}
/**
@@ -345,36 +340,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
private void migrateOAuthCredentials()
{
if (OsmOAuth.containsOAuth1Credentials())
{
// Remove old OAuth v1 secrets
OsmOAuth.clearOAuth1Credentials();
// Notify user to re-login
dismissAlertDialog();
final DialogInterface.OnClickListener navigateToLoginHandler =
(dialog, which) -> startActivity(new Intent(MwmActivity.this, OsmLoginActivity.class));
final int marginBase = getResources().getDimensionPixelSize(R.dimen.margin_base);
final float textSize = getResources().getDimension(R.dimen.line_spacing_extra_1);
final TextView text = new TextView(this);
text.setText(getText(R.string.alert_reauth_message));
text.setPadding(marginBase, marginBase, marginBase, marginBase);
text.setTextSize(textSize);
text.setMovementMethod(LinkMovementMethod.getInstance());
mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.login_osm)
.setView(text)
.setPositiveButton(R.string.login, navigateToLoginHandler)
.setNegativeButton(R.string.cancel, null)
.setOnDismissListener(dialog -> mAlertDialog = null)
.show();
}
}
private static void checkMeasurementSystem()
{
UnitLocale.initializeCurrentUnits();

15
android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
View File

@@ -29,9 +29,6 @@ public final class OsmOAuth
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private static SharedPreferences mPrefs;
private static final String PREF_OSM_TOKEN = "OsmToken"; // Unused after migration from OAuth1 to OAuth2
private static final String PREF_OSM_SECRET = "OsmSecret"; // Unused after migration from OAuth1 to OAuth2
private static final String PREF_OSM_USERNAME = "OsmUsername";
private static final String PREF_OSM_CHANGESETS_COUNT = "OsmChangesetsCount";
private static final String PREF_OSM_OAUTH2_TOKEN = "OsmOAuth2Token";
@@ -48,16 +45,6 @@ public final class OsmOAuth
return mPrefs.contains(PREF_OSM_OAUTH2_TOKEN);
}
public static boolean containsOAuth1Credentials()
{
return mPrefs.contains(PREF_OSM_TOKEN) && mPrefs.contains(PREF_OSM_SECRET);
}
public static void clearOAuth1Credentials()
{
mPrefs.edit().remove(PREF_OSM_TOKEN).remove(PREF_OSM_SECRET).apply();
}
public static String getAuthToken()
{
return mPrefs.getString(PREF_OSM_OAUTH2_TOKEN, "");
@@ -82,8 +69,6 @@ public final class OsmOAuth
public static void clearAuthorization()
{
mPrefs.edit()
.remove(PREF_OSM_TOKEN)
.remove(PREF_OSM_SECRET)
.remove(PREF_OSM_USERNAME)
.remove(PREF_OSM_OAUTH2_TOKEN)
.apply();