Replace all etesync links to open in the webview activity.

pull/2/head
Tal Hacohen 7 years ago
parent c041ddb690
commit 8c9ec3bcc7

@ -13,6 +13,7 @@ import android.support.v7.app.NotificationCompat;
import com.etesync.syncadapter.journalmanager.Exceptions;
import com.etesync.syncadapter.ui.AccountSettingsActivity;
import com.etesync.syncadapter.ui.DebugInfoActivity;
import com.etesync.syncadapter.ui.WebViewActivity;
import java.util.logging.Level;
@ -95,7 +96,7 @@ public class NotificationHelper {
if (e instanceof Exceptions.UnauthorizedException) {
detailsIntent = new Intent(this, AccountSettingsActivity.class);
} else if (e instanceof Exceptions.UserInactiveException) {
startActivity(new Intent(Intent.ACTION_VIEW, Constants.dashboard));
WebViewActivity.openUrl(this, Constants.dashboard);
return;
} else {
detailsIntent = new Intent(this, DebugInfoActivity.class);

@ -93,10 +93,10 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
startActivity(new Intent(Intent.ACTION_VIEW, Constants.webUri));
break;
case R.id.nav_guide:
startActivity(new Intent(Intent.ACTION_VIEW, Constants.helpUri));
WebViewActivity.openUrl(this, Constants.helpUri);
break;
case R.id.nav_faq:
startActivity(new Intent(Intent.ACTION_VIEW, Constants.faqUri));
WebViewActivity.openUrl(this, Constants.faqUri);
break;
case R.id.nav_report_issue:
startActivity(new Intent(Intent.ACTION_VIEW, Constants.reportIssueUri));
@ -110,5 +110,4 @@ public class AccountsActivity extends AppCompatActivity implements NavigationVie
drawer.closeDrawer(GravityCompat.START);
return true;
}
}

@ -22,15 +22,16 @@ import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import com.etesync.syncadapter.BuildConfig;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.model.ServiceDB;
import com.etesync.syncadapter.model.Settings;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import lombok.Cleanup;
public class StartupDialogFragment extends DialogFragment {

@ -17,6 +17,7 @@ import android.view.MenuItem;
import com.etesync.syncadapter.App;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.WebViewActivity;
/**
* Activity to initially connect to a server and create an account.
@ -71,6 +72,6 @@ public class LoginActivity extends AppCompatActivity {
}
public void showHelp(MenuItem item) {
startActivity(new Intent(Intent.ACTION_VIEW, Constants.helpUri));
WebViewActivity.openUrl(this, Constants.helpUri);
}
}

@ -21,6 +21,7 @@ import android.widget.EditText;
import com.etesync.syncadapter.Constants;
import com.etesync.syncadapter.R;
import com.etesync.syncadapter.ui.WebViewActivity;
import com.etesync.syncadapter.ui.widget.EditPassword;
public class LoginCredentialsFragment extends Fragment {
@ -53,8 +54,7 @@ public class LoginCredentialsFragment extends Fragment {
@Override
public void onClick(View v) {
Uri createUri = Constants.registrationUrl.buildUpon().appendQueryParameter("email", editUserName.getText().toString()).build();
Intent intent = new Intent(Intent.ACTION_VIEW, createUri);
startActivity(intent);
WebViewActivity.openUrl(getContext(), createUri);
}
});

Loading…
Cancel
Save